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

订单加价扣除平台抽成和团队抽成

This commit is contained in:
Hawking 2023-07-08 17:34:18 +08:00
parent 44f780f15b
commit 95c9bfcfcf
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -533,10 +533,10 @@ public class OrderDetailServiceImpl implements OrderDetailService {
ArrayList<DivMember> divMembers = new ArrayList<>(); ArrayList<DivMember> divMembers = new ArrayList<>();
// 是否有罚金 // 是否有罚金
boolean haveFine = MoneyUtil.gt0(fineMoney); boolean haveFine = MoneyUtil.gt0(fineMoney);
BigDecimal workerMoney = odMoney.subtract(fineMoney);
if (haveFine) { // 有罚金 从罚金里扣除手续费 if (haveFine) { // 有罚金 从罚金里扣除手续费
// 平台的分账信息 用来承担罚金 // 平台的分账信息 用来承担罚金
divMembers.add(new DivMember("0", MoneyUtil.toS(fineMoney), true)); divMembers.add(new DivMember("0", MoneyUtil.toS(fineMoney), true));
BigDecimal workerMoney = odMoney.subtract(fineMoney);
if (MoneyUtil.gt0(workerMoney)) { if (MoneyUtil.gt0(workerMoney)) {
divMembers.add(new DivMember(memberId, MoneyUtil.toS(workerMoney), false)); divMembers.add(new DivMember(memberId, MoneyUtil.toS(workerMoney), false));
} }
@ -860,13 +860,13 @@ public class OrderDetailServiceImpl implements OrderDetailService {
OrderDetail orderDetail = orderDetailMapper.selectById(body.getOrderDetailId()); OrderDetail orderDetail = orderDetailMapper.selectById(body.getOrderDetailId());
Assert.notNull(orderDetail, "订单不存在"); Assert.notNull(orderDetail, "订单不存在");
boolean finish = ZERO.equals(orderDetail.getDrawCashStatus()) && boolean unFinish = ZERO.equals(orderDetail.getDrawCashStatus()) &&
OrderStatus.FINISH_CHECK.code() != orderDetail.getOrderStatus() && OrderStatus.FINISH_CHECK.code() != orderDetail.getOrderStatus() &&
OrderStatus.FINISH.code() != orderDetail.getOrderStatus(); OrderStatus.FINISH.code() != orderDetail.getOrderStatus();
Assert.isTrue(finish, "订单已经完成，不能再做追加扣减操作"); Assert.isTrue(unFinish, "订单已经完成，不能再做追加扣减操作");
boolean cancel = OrderStatus.CANCEL.code() != orderDetail.getOrderStatus(); boolean unCancel = OrderStatus.CANCEL.code() != orderDetail.getOrderStatus();
Assert.isTrue(cancel, "订单已经取消，不能再做追加扣减操作"); Assert.isTrue(unCancel, "订单已经取消，不能再做追加扣减操作");
Assert.isTrue(BigDecimal.ZERO.compareTo(body.getMoney()) != 0, "金额不能为0"); Assert.isTrue(BigDecimal.ZERO.compareTo(body.getMoney()) != 0, "金额不能为0");