diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java index defb3e48..d01d6ef7 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java @@ -154,8 +154,8 @@ public class OrderMasterServiceImpl implements OrderMasterService { Assert.notNull(orderMaster, "订单不存在"); List orderDetails = orderDetailService.selectByOrderMasterId(orderMasterId); for (OrderDetail orderDetail : orderDetails) { - logger.info("主订单[id={}]存在未完成的子订单", orderMasterId); if (orderDetail.getOrderStatus() < 5) { + logger.info("主订单[id={}]存在未完成的子订单", orderMasterId); return; } } @@ -183,13 +183,12 @@ public class OrderMasterServiceImpl implements OrderMasterService { BigDecimal confirmAmt = BigDecimal.ZERO; // 大师傅/店铺提成=订单总金额 - 上门师傅结单金额 - 平台提成 - 订单超时罚金 - 分销金额 - 退款金额 - 订单加价 - BigDecimal bigWorkerAmt = financialMaster.getPayMoney(); + BigDecimal bigWorkerAmt = financialMaster.getServerMoney(); // key:memberId(分账账户ID) value:分账金额 HashMap memberMap = new HashMap<>(); for (FinancialDetail financialDetail : financialDetails) { - bigWorkerAmt = bigWorkerAmt.subtract(financialDetail.getPayMoney()); String memberId; switch (financialDetail.getFinancialDetailType()) { case 0: @@ -227,12 +226,6 @@ public class OrderMasterServiceImpl implements OrderMasterService { } } - List fcrList = financialChangeRecordService.selectByMasterId(orderMasterId); - for (FinancialChangeRecord fcr : fcrList) { - if (PayStatus.PAID.getCode().equals(fcr.getPayStatus()) || PayStatus.PAYED_ADD.getCode().equals(fcr.getPayStatus())) { - confirmAmt = confirmAmt.subtract(fcr.getChangeMoney()); - } - } memberMap.put(AdapayUtils.getWorkerMemberId(orderMaster.getWorkerId(), orderMaster.getDeptId()), bigWorkerAmt); confirmAmt = confirmAmt.add(bigWorkerAmt);