From 22f73e9a0627e07110877d5fe8a9ef41bf08d7e9 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Tue, 1 Aug 2023 20:07:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B8=88=E5=82=85=E6=8F=90=E6=88=90?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ghy/order/service/impl/OrderDetailServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java index 33e8a572..37a6882f 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java @@ -668,6 +668,10 @@ public class OrderDetailServiceImpl implements OrderDetailService { platformFee = changeMoney.multiply(deptRate).setScale(2, RoundingMode.UP); masterFee = changeMoney.multiply(teamRete).setScale(2, RoundingMode.UP); } + // 如果是大师傅自己接单,则不需要抽成 + if(AdapayUtils.getWorkerMemberId(workerId, deptId).equals(masterMemberId)){ + masterFee = BigDecimal.ZERO; + } // 上门师傅的报酬 BigDecimal workerFee = changeMoney.subtract(platformFee).subtract(masterFee); BigDecimal fineMoney = BigDecimal.ZERO; @@ -775,7 +779,10 @@ public class OrderDetailServiceImpl implements OrderDetailService { placeTwoMoney = oasMoney.multiply(twoRate).setScale(2, RoundingMode.UP); } - + // 如果是大师傅自己接单,则不需要抽成 + if(memberId.equals(masterMemberId)){ + masterFee = BigDecimal.ZERO; + } // 上门师傅的报酬 BigDecimal workerFee = oasMoney.subtract(platformFee).subtract(masterFee); // 分账信息