clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

大师傅提成合并问题

This commit is contained in:
kuang.yife 2023-08-01 20:07:05 +08:00
parent 14d3a48dda
commit 22f73e9a06
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
View File

@ -668,6 +668,10 @@ public class OrderDetailServiceImpl implements OrderDetailService {
platformFee = changeMoney.multiply(deptRate).setScale(2, RoundingMode.UP); platformFee = changeMoney.multiply(deptRate).setScale(2, RoundingMode.UP);
masterFee = changeMoney.multiply(teamRete).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 workerFee = changeMoney.subtract(platformFee).subtract(masterFee);
BigDecimal fineMoney = BigDecimal.ZERO; BigDecimal fineMoney = BigDecimal.ZERO;
@ -775,7 +779,10 @@ public class OrderDetailServiceImpl implements OrderDetailService {
placeTwoMoney = oasMoney.multiply(twoRate).setScale(2, RoundingMode.UP); placeTwoMoney = oasMoney.multiply(twoRate).setScale(2, RoundingMode.UP);
} }
// 如果是大师傅自己接单,则不需要抽成
if(memberId.equals(masterMemberId)){
masterFee = BigDecimal.ZERO;
}
// 上门师傅的报酬 // 上门师傅的报酬
BigDecimal workerFee = oasMoney.subtract(platformFee).subtract(masterFee); BigDecimal workerFee = oasMoney.subtract(platformFee).subtract(masterFee);
// 分账信息 // 分账信息