clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix

This commit is contained in:
kuang.yife 2023-06-14 21:22:44 +08:00
parent a82fa6f21f
commit 5d99c998fe
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
View File

@ -127,8 +127,15 @@ public class OrderDetailController extends BaseController {
Map<Long, OrderMaster> orderMasterMap = orderMasters.stream().collect(Collectors.toMap(OrderMaster::getId, x -> x, (x, y) -> y)); Map<Long, OrderMaster> orderMasterMap = orderMasters.stream().collect(Collectors.toMap(OrderMaster::getId, x -> x, (x, y) -> y));
List<FinancialMaster> financialMasters = financialMasterService.selectByOrderMasterIds(orderMasterIds); List<FinancialMaster> financialMasters = financialMasterService.selectByOrderMasterIds(orderMasterIds);
Map<Long, FinancialMaster> financialMasterMap = financialMasters Map<Long, FinancialMaster> financialMasterMap = new HashMap<>();
.stream().collect(Collectors.toMap(FinancialMaster::getOrderMasterId, x -> x, (x, y) -> y)); if(0 == orderDetail.getSysPayStatus()){
financialMasters
.stream().filter(financialMaster->0 == financialMaster.getPayStatus()).collect(Collectors.toMap(FinancialMaster::getOrderMasterId, x -> x, (x, y) -> y));
}else {
financialMasters
.stream().collect(Collectors.toMap(FinancialMaster::getOrderMasterId, x -> x, (x, y) -> y));
}
Set<Long> orderDetailIds = orderDetails.stream().map(OrderDetail::getId).collect(Collectors.toSet()); Set<Long> orderDetailIds = orderDetails.stream().map(OrderDetail::getId).collect(Collectors.toSet());
Map<Long, FinancialDetail> financialDetailMap = financialDetailService.selectByOrderDetailIds(orderDetailIds) Map<Long, FinancialDetail> financialDetailMap = financialDetailService.selectByOrderDetailIds(orderDetailIds)

2
ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
View File

@ -105,6 +105,8 @@ public class OrderDetail extends BaseEntity {
private Integer ledgerAccountStatus; private Integer ledgerAccountStatus;
private Integer sysPayStatus;
/** /**
* 发起提现后Adapay返回的对象ID draw_cash_id * 发起提现后Adapay返回的对象ID draw_cash_id
*/ */