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-24 16:50:32 +08:00
parent d132a9f68f
commit 9fad62d168
1 changed files with 5 additions and 4 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

@ -775,12 +775,9 @@ 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);
} }
if (MoneyUtil.gt0(workerFee)) {
divMembers.add(new DivMember(memberId, MoneyUtil.toS(workerFee), !feeFlag));
}
masterFee=workerFee.multiply(teamRete).add(teamMoney).setScale(2, RoundingMode.UP); masterFee=workerFee.multiply(teamRete).add(teamMoney).setScale(2, RoundingMode.UP);
if (MoneyUtil.lt(masterFee.add(platformFee), workerFee)) { if (MoneyUtil.lt(masterFee.add(platformFee), workerFee)) {
masterFee = workerFee.multiply(teamRete).setScale(2, RoundingMode.UP); masterFee = workerFee.multiply(workerFee).setScale(2, RoundingMode.UP);
} }
// 如果是大师傅自己接单,则不需要抽成 // 如果是大师傅自己接单,则不需要抽成
if(AdapayUtils.getWorkerMemberId(workerId, deptId).equals(masterMemberId)){ if(AdapayUtils.getWorkerMemberId(workerId, deptId).equals(masterMemberId)){
@ -792,6 +789,10 @@ public class OrderDetailServiceImpl implements OrderDetailService {
feeFlag = true; feeFlag = true;
} }
logger.info("大师傅的扣点{}，最终的扣完之后的金额{}",masterFee,workerFee); logger.info("大师傅的扣点{}，最终的扣完之后的金额{}",masterFee,workerFee);
if (MoneyUtil.gt0(workerFee)) {
divMembers.add(new DivMember(memberId, MoneyUtil.toS(workerFee), !feeFlag));
}
logger.info("改价单各个金额{}，{}，{}，{}",placeOneMoney,placeTwoMoney,masterFee,workerFee);
String orderNo = "FCR_" + fcRecord.getId() + "_" + System.currentTimeMillis(); String orderNo = "FCR_" + fcRecord.getId() + "_" + System.currentTimeMillis();
//调用分账 //调用分账
logger.info("子订单[{}]的[改价单]发起分账", orderDetailId); logger.info("子订单[{}]的[改价单]发起分账", orderDetailId);