diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index ea3caea9..6202b7d4 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -133,6 +133,13 @@ public class OrderController extends BaseController { if(!om.getWorkerId().equals(request.getWorkerId())){ boolean checkInTeam = workerService.checkInTeam(assignWorker.getWorkerId(), acceptWorker.getWorkerId()); Assert.isTrue(checkInTeam, "接单师傅不在本团队"); + }else { + // 自己接单 -- 计算剩余金额 + BigDecimal realPay = fm.getPayMoney(); + for (FinancialDetail financialDetail : financialDetailService.selectByFinancialMasterId(fm.getId())) { + realPay = realPay.subtract(financialDetail.getPayMoney()); + } + request.setTotalPay(realPay); } // 判断是否全部派完