From 95c9bfcfcfc4768a49c1f1f7b2a5e4c9a9c0a626 Mon Sep 17 00:00:00 2001 From: Hawking Date: Sat, 8 Jul 2023 17:34:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8A=A0=E4=BB=B7=E6=89=A3?= =?UTF-8?q?=E9=99=A4=E5=B9=B3=E5=8F=B0=E6=8A=BD=E6=88=90=E5=92=8C=E5=9B=A2?= =?UTF-8?q?=E9=98=9F=E6=8A=BD=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ghy/order/service/impl/OrderDetailServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 38a598fd..64710219 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 @@ -533,10 +533,10 @@ public class OrderDetailServiceImpl implements OrderDetailService { ArrayList divMembers = new ArrayList<>(); // 是否有罚金 boolean haveFine = MoneyUtil.gt0(fineMoney); - BigDecimal workerMoney = odMoney.subtract(fineMoney); if (haveFine) { // 有罚金 从罚金里扣除手续费 // 平台的分账信息 用来承担罚金 divMembers.add(new DivMember("0", MoneyUtil.toS(fineMoney), true)); + BigDecimal workerMoney = odMoney.subtract(fineMoney); if (MoneyUtil.gt0(workerMoney)) { divMembers.add(new DivMember(memberId, MoneyUtil.toS(workerMoney), false)); } @@ -860,13 +860,13 @@ public class OrderDetailServiceImpl implements OrderDetailService { OrderDetail orderDetail = orderDetailMapper.selectById(body.getOrderDetailId()); Assert.notNull(orderDetail, "订单不存在"); - boolean finish = ZERO.equals(orderDetail.getDrawCashStatus()) && + boolean unFinish = ZERO.equals(orderDetail.getDrawCashStatus()) && OrderStatus.FINISH_CHECK.code() != orderDetail.getOrderStatus() && OrderStatus.FINISH.code() != orderDetail.getOrderStatus(); - Assert.isTrue(finish, "订单已经完成，不能再做追加扣减操作"); + Assert.isTrue(unFinish, "订单已经完成，不能再做追加扣减操作"); - boolean cancel = OrderStatus.CANCEL.code() != orderDetail.getOrderStatus(); - Assert.isTrue(cancel, "订单已经取消，不能再做追加扣减操作"); + boolean unCancel = OrderStatus.CANCEL.code() != orderDetail.getOrderStatus(); + Assert.isTrue(unCancel, "订单已经取消，不能再做追加扣减操作"); Assert.isTrue(BigDecimal.ZERO.compareTo(body.getMoney()) != 0, "金额不能为0");