From d7547acf8fcea7fd28a9494e8fa98ec1f394373c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 5 Jul 2024 17:30:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95massageMoney=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4=E4=B8=BA=E5=87=8F?= =?UTF-8?q?=E5=8E=BB=E4=BB=A3=E9=87=91=E5=88=B8=E5=89=8D=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrdersServiceImpl.java | 60 +++++++++++-------- 1 file changed, 35 insertions(+), 25 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 5ed8601..168a209 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 @@ -400,9 +400,9 @@ public class OrdersServiceImpl extends ServiceImpl implements return Result.error("当前应付总金额不满足优惠券使用的最小额度，请重新选择优惠券！"); } + orders.setMassageMoney(payMoney); //减去代金券的金额 payMoney = payMoney.subtract(orders.getCouponMoney()); - orders.setMassageMoney(payMoney); String value1 = commonInfoService.findOne(395).getValue(); int i = 0; @@ -546,8 +546,12 @@ public class OrdersServiceImpl extends ServiceImpl implements } //计算项目收益 + BigDecimal massageMoney = orders.getMassageMoney(); + if(orders.getCouponMoney()!=null){ + massageMoney = massageMoney.subtract(orders.getCouponMoney()); + } //获取项目应支付金额 - BigDecimal projectBenefits = orders.getMassageMoney(); + BigDecimal projectBenefits = massageMoney; //计算技师项目提成金额 orders.setProjectBenefits(projectBenefits.multiply(artificer.getRate()).setScale(2,BigDecimal.ROUND_HALF_UP)); @@ -1095,7 +1099,11 @@ public class OrdersServiceImpl extends ServiceImpl implements ordersOld.setArtificerTaxiMoney(BigDecimal.ZERO); ordersOld.setPingTaxiMoney(BigDecimal.ZERO); - BigDecimal projectBenefits = oldOrders.getMassageMoney(); + BigDecimal massageMoney = oldOrders.getMassageMoney(); + if(oldOrders.getCouponMoney()!=null){ + massageMoney = massageMoney.subtract(oldOrders.getCouponMoney()); + } + BigDecimal projectBenefits = massageMoney; BigDecimal subtract = oldOrders.getPayMoney(); //计算用户收益 BigDecimal artificerPrice = subtract.multiply(artificer.getRate()); @@ -1276,11 +1284,7 @@ public class OrdersServiceImpl extends ServiceImpl implements BigDecimal massagePrice = price.multiply(orders.getTechnicianRate()).divide(new BigDecimal(100)).add(price);//技师等级加成金额 massagePrice = massagePrice.multiply(orders.getVipRate()).divide(new BigDecimal(100));//会员优惠后金额 - BigDecimal couponMoney = oldOrders.getCouponMoney(); - if(couponMoney == null){ - couponMoney = BigDecimal.ZERO; - } - massagePrice = massagePrice.subtract(couponMoney); + orders.setMassageMoney(massagePrice); BigDecimal chajia = orders.getMassageMoney().subtract(oldOrders.getMassageMoney()); @@ -1432,8 +1436,12 @@ public class OrdersServiceImpl extends ServiceImpl implements } } } + BigDecimal massageMoney = oldOrders.getMassageMoney(); + if(oldOrders.getCouponMoney()!=null){ + massageMoney = massageMoney.subtract(oldOrders.getCouponMoney()); + } //加上车费 - orders.setPayMoney(orders.getMassageMoney().add(taxiMoney)); + orders.setPayMoney(massageMoney.add(taxiMoney)); BigDecimal artificerPrice = BigDecimal.ZERO; Artificer artificer = artificerService.getById(orders.getArtificerId()); //查询是否计算出租车扣费 @@ -1462,10 +1470,9 @@ public class OrdersServiceImpl extends ServiceImpl implements //用户收益加上通行费用 artificerPrice = artificerPrice.add(taxiMoney); } - //计算项目收益 //获取项目应支付金额 - BigDecimal projectBenefits = orders.getMassageMoney(); + BigDecimal projectBenefits = massageMoney; //计算技师项目提成金额 orders.setProjectBenefits(projectBenefits.multiply(artificer.getRate()).setScale(2, BigDecimal.ROUND_HALF_UP)); @@ -1614,9 +1621,9 @@ public class OrdersServiceImpl extends ServiceImpl implements return Result.error("当前应付总金额不满足优惠券使用的最小额度，请重新选择优惠券！"); } + orders.setMassageMoney(payMoney); //减去代金券的金额 payMoney = payMoney.subtract(orders.getCouponMoney()); - orders.setMassageMoney(payMoney); String value1 = commonInfoService.findOne(395).getValue(); int i = 0; @@ -1747,8 +1754,12 @@ public class OrdersServiceImpl extends ServiceImpl implements } //计算项目收益 + BigDecimal massageMoney = orders.getMassageMoney(); + if(orders.getCouponMoney()!=null){ + massageMoney = massageMoney.subtract(orders.getCouponMoney()); + } //获取项目应支付金额 - BigDecimal projectBenefits = orders.getMassageMoney(); + BigDecimal projectBenefits = massageMoney; //计算技师项目提成金额 orders.setProjectBenefits(projectBenefits.multiply(artificer.getRate()).setScale(2, BigDecimal.ROUND_HALF_UP)); @@ -1933,10 +1944,6 @@ public class OrdersServiceImpl extends ServiceImpl implements BigDecimal massagePrice = price.multiply(orders.getTechnicianRate()).divide(new BigDecimal(100)).add(price);//技师等级加成金额 massagePrice = massagePrice.multiply(orders.getVipRate()).divide(new BigDecimal(100));//会员优惠后金额 - BigDecimal couponMoney = oldOrders.getCouponMoney(); - if(couponMoney != null){ - massagePrice = massagePrice.subtract(couponMoney); - } orders.setMassageMoney(massagePrice); //项目差价 @@ -1964,7 +1971,11 @@ public class OrdersServiceImpl extends ServiceImpl implements BigDecimal artificerPrice = orders.getPayMoney().subtract(taxiMoney); artificerPrice = artificerPrice.multiply(artificer.getRate()); artificerPrice = artificerPrice.setScale(2, BigDecimal.ROUND_HALF_UP); - BigDecimal projectBenefits = orders.getMassageMoney(); + BigDecimal massageMoney = orders.getMassageMoney(); + if(orders.getCouponMoney()!=null){ + massageMoney = massageMoney.subtract(orders.getCouponMoney()); + } + BigDecimal projectBenefits = massageMoney; if(orders.getPayWay().equals(5)){ BigDecimal rate = new BigDecimal(commonInfoService.findOne(449).getValue()); orders.setWalletRate(rate); @@ -2138,7 +2149,12 @@ public class OrdersServiceImpl extends ServiceImpl implements //设置出租车扣款为0 ordersOld.setPingTaxiMoney(BigDecimal.ZERO); } - BigDecimal projectBenefits = oldOrders.getMassageMoney(); + + BigDecimal massageMoney = oldOrders.getMassageMoney(); + if(oldOrders.getCouponMoney()!=null){ + massageMoney = massageMoney.subtract(oldOrders.getCouponMoney()); + } + BigDecimal projectBenefits = massageMoney; //计算用户收益 BigDecimal oldArtificerPrice = oldOrders.getPayMoney().subtract(oldOrders.getTaxiMoney()); oldArtificerPrice = oldArtificerPrice.multiply(artificer.getRate()); @@ -4065,12 +4081,6 @@ public class OrdersServiceImpl extends ServiceImpl implements public Result selectOrdersDetails(Long ordersId) { Integer minutes = Integer.valueOf(commonInfoService.findOne(452).getValue()); Orders orders = baseMapper.selectById(ordersId); - BigDecimal couponMoney = orders.getCouponMoney(); - if(couponMoney != null){ - orders.setMassageCouponMoney(orders.getMassageMoney().add(couponMoney)); - }else{ - orders.setMassageCouponMoney(orders.getMassageMoney()); - } String serveTime = orders.getServeTime(); Date serveTimeDate = DateUtils.stringToDate(serveTime,"yyyy-MM-dd HH:mm"); serveTimeDate = DateUtils.addDateMinutes(serveTimeDate,minutes);