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

no message

This commit is contained in:
cb 2025-04-25 14:48:44 +08:00
parent 9fad62d168
commit c99975c300
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -775,23 +775,25 @@ public class OrderDetailServiceImpl implements OrderDetailService {
divMembers.add(new DivMember(placeTwo, MoneyUtil.toS(placeTwoMoney), !feeFlag)); divMembers.add(new DivMember(placeTwo, MoneyUtil.toS(placeTwoMoney), !feeFlag));
workerFee = workerFee.subtract(placeTwoMoney); workerFee = workerFee.subtract(placeTwoMoney);
} }
masterFee=workerFee.multiply(teamRete).add(teamMoney).setScale(2, RoundingMode.UP); //子师傅的费用计算
if (MoneyUtil.lt(masterFee.add(platformFee), workerFee)) { BigDecimal detailFee=BigDecimal.ZERO;
masterFee = workerFee.multiply(workerFee).setScale(2, RoundingMode.UP);
} logger.info("大师傅初始金额{}平台费用{}团队抽成金额{}",masterFee,platformFee,teamMoney);
// 如果是大师傅自己接单,则不需要抽成 // 如果是大师傅自己接单,则不需要抽成
if(AdapayUtils.getWorkerMemberId(workerId, deptId).equals(masterMemberId)){ if(AdapayUtils.getWorkerMemberId(workerId, deptId).equals(masterMemberId)){
masterFee = BigDecimal.ZERO; masterFee = BigDecimal.ZERO;
} }else{
if (MoneyUtil.gt0(masterFee)) { if (MoneyUtil.gt0(workerFee)){
divMembers.add(new DivMember(masterMemberId, MoneyUtil.toS(masterFee), !feeFlag)); detailFee=workerFee.multiply(BigDecimal.ONE.subtract(teamRete)).setScale(2, RoundingMode.DOWN);
workerFee = workerFee.subtract(masterFee);
feeFlag = true;
}
logger.info("大师傅的扣点{}，最终的扣完之后的金额{}",masterFee,workerFee);
if (MoneyUtil.gt0(workerFee)) {
divMembers.add(new DivMember(memberId, MoneyUtil.toS(workerFee), !feeFlag)); divMembers.add(new DivMember(memberId, MoneyUtil.toS(workerFee), !feeFlag));
} }
masterFee=workerFee.subtract(detailFee);
if (MoneyUtil.gt0(masterFee)) {
divMembers.add(new DivMember(masterMemberId, MoneyUtil.toS(masterFee), !feeFlag));
}
}
logger.info("子师傅的费用{}子师傅抽成比例{}",detailFee,BigDecimal.ONE.subtract(teamRete));
logger.info("大师傅的扣点{}，最终的扣完之后的金额{}",masterFee,workerFee);
logger.info("改价单各个金额{}，{}，{}，{}",placeOneMoney,placeTwoMoney,masterFee,workerFee); logger.info("改价单各个金额{}，{}，{}，{}",placeOneMoney,placeTwoMoney,masterFee,workerFee);
String orderNo = "FCR_" + fcRecord.getId() + "_" + System.currentTimeMillis(); String orderNo = "FCR_" + fcRecord.getId() + "_" + System.currentTimeMillis();
//调用分账 //调用分账