From a475847780e9da180b0997b8b1a0cd889c3973f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Tue, 2 Jul 2024 20:23:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=80=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artificer/service/impl/OrdersServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java index 31407c0..f67057a 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java @@ -2119,9 +2119,9 @@ public class OrdersServiceImpl extends ServiceImpl implements //项目扣款 BigDecimal massageMoneyDeduction = BigDecimal.ZERO; if(massageRate.compareTo(BigDecimal.ZERO) == 0){ - massageMoneyDeduction = orders.getPayMoney().subtract(orders.getTaxiMoney()).multiply(massageRate); - }else{ massageMoneyDeduction = massageDeduction; + }else{ + massageMoneyDeduction = orders.getPayMoney().subtract(orders.getTaxiMoney()).multiply(massageRate); } if(orders.getPayMoney().subtract(orders.getTaxiMoney()).compareTo(massageDeduction) < 0){ massageMoneyDeduction = orders.getPayMoney().subtract(orders.getTaxiMoney()); @@ -2129,9 +2129,9 @@ public class OrdersServiceImpl extends ServiceImpl implements //车费扣款 BigDecimal taxiMoneyDeduction = BigDecimal.ZERO; if(trafficRate.compareTo(BigDecimal.ZERO) == 0){ - taxiMoneyDeduction = orders.getTaxiMoney().multiply(trafficRate); - }else{ taxiMoneyDeduction = trafficDeduction; + }else{ + taxiMoneyDeduction = orders.getTaxiMoney().multiply(trafficRate); } if(orders.getTaxiMoney().compareTo(taxiMoneyDeduction) < 0){ taxiMoneyDeduction = orders.getTaxiMoney(); @@ -2291,12 +2291,12 @@ public class OrdersServiceImpl extends ServiceImpl implements if (orders.getShopUserId() != null) { userMoneyDetails.setContent("用户取消订单，总扣除：" + sumMoney + "，平台扣除：" + orders.getPingMoney() + "，商家扣除：" + orders.getShopMoney() + "，用户代理扣除：" + orders.getOneUserMoney() + "，技师代理扣除：" + orders.getOneArtificerMoney() + - "，打车费：" + orders.getTaxiMoney() + + "，打车费：" + orders.getTaxiMoney() + "，平台扣除打车费：" + orders.getPingTaxiMoney() + "，到账打车费：" + orders.getArtificerTaxiMoney() + "，到账总金额：" + orders.getSumArtificerMoney()); } else { userMoneyDetails.setContent("用户取消订单，总扣除：" + sumMoney + "，平台扣除：" + orders.getPingMoney() + "，用户代理扣除：" + orders.getOneUserMoney() + "，技师代理扣除：" + orders.getOneArtificerMoney() + - "，打车费：" + orders.getTaxiMoney() + + "，打车费：" + orders.getTaxiMoney() + "，平台扣除打车费：" + orders.getPingTaxiMoney() + "，到账打车费：" + orders.getArtificerTaxiMoney() + "，到账总金额：" + orders.getSumArtificerMoney()); } }