From 90c5d83da92358989cd75db4389e232634b70989 Mon Sep 17 00:00:00 2001 From: "kuang.yifei@iwhalecloud.com" Date: Thu, 21 Jul 2022 16:20:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=98=AF=E6=9C=AC=E4=BA=BA?= =?UTF-8?q?=E6=8E=A5=E5=8D=95=EF=BC=8C=E5=88=99=E9=9C=80=E8=A6=81=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E5=89=A9=E4=BD=99=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ghy/web/controller/order/OrderController.java | 7 +++++++ 1 file changed, 7 insertions(+) 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); } // 判断是否全部派完