diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index 43895f2d..0c14ac7a 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -127,8 +127,15 @@ public class OrderDetailController extends BaseController { Map orderMasterMap = orderMasters.stream().collect(Collectors.toMap(OrderMaster::getId, x -> x, (x, y) -> y)); List financialMasters = financialMasterService.selectByOrderMasterIds(orderMasterIds); - Map financialMasterMap = financialMasters - .stream().collect(Collectors.toMap(FinancialMaster::getOrderMasterId, x -> x, (x, y) -> y)); + Map financialMasterMap = new HashMap<>(); + 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 orderDetailIds = orderDetails.stream().map(OrderDetail::getId).collect(Collectors.toSet()); Map financialDetailMap = financialDetailService.selectByOrderDetailIds(orderDetailIds) diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java index a59bdf40..1eabcee8 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java @@ -105,6 +105,8 @@ public class OrderDetail extends BaseEntity { private Integer ledgerAccountStatus; + private Integer sysPayStatus; + /** * 发起提现后Adapay返回的对象ID draw_cash_id */