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); // 分账信息