From f6ff32fe71c590463b7b3e302ffa9768f5884910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Wed, 17 Jul 2024 09:59:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B9=E7=9B=AE=E4=BB=B7?= =?UTF-8?q?=E6=A0=BC=E8=B0=83=E5=9B=9E=EF=BC=8C=E4=BB=B7=E6=A0=BC*?= =?UTF-8?q?=E6=8A=80=E5=B8=88=E5=8A=A0=E6=88=90*vip=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrdersServiceImpl.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 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 f03d57d..f36c847 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 @@ -764,13 +764,13 @@ public class OrdersServiceImpl extends ServiceImpl implements orders.setPriceMarkup(priceMarkup); //会员优惠后金额，及会员减免金额 - BigDecimal vipMoney = price.multiply(orders.getVipRate()).divide(new BigDecimal(100)); + BigDecimal vipMoney = priceMarkup.multiply(orders.getVipRate()).divide(new BigDecimal(100)); vipMoney = vipMoney.setScale(0,BigDecimal.ROUND_UP); - BigDecimal vipReductionMoney = price.subtract(vipMoney); + BigDecimal vipReductionMoney = priceMarkup.subtract(vipMoney); orders.setVipReductionMoney(vipReductionMoney); //项目价格 = 原金额+技师加成金额-会员减免金额 - BigDecimal payMoney = price.add(technicianMoney).subtract(vipReductionMoney).setScale(0,BigDecimal.ROUND_UP); + BigDecimal payMoney = vipMoney; orders.setMassageMoney(payMoney); //判断金额是否满足代金券金额最少消费额度 @@ -1492,9 +1492,9 @@ public class OrdersServiceImpl extends ServiceImpl implements orders.setPriceMarkup(priceMarkup); //会员优惠后金额，及会员减免金额 - BigDecimal vipMoney = price.multiply(orders.getVipRate()).divide(new BigDecimal(100)); + BigDecimal vipMoney = priceMarkup.multiply(orders.getVipRate()).divide(new BigDecimal(100)); vipMoney = vipMoney.setScale(0,BigDecimal.ROUND_UP); - BigDecimal vipReductionMoney = price.subtract(vipMoney); + BigDecimal vipReductionMoney = priceMarkup.subtract(vipMoney); // orders.setVipReductionMoney(vipReductionMoney); BigDecimal chajia = orders.getMassagePrice().subtract(oldOrders.getMassagePrice()); @@ -1503,13 +1503,13 @@ public class OrdersServiceImpl extends ServiceImpl implements chajiaTechnicianMoney = chajiaTechnicianMoney.setScale(0,BigDecimal.ROUND_UP); orders.setTechnicianMoney(chajiaTechnicianMoney); - BigDecimal chajiaVipMoney = chajia.multiply(orders.getVipRate()).divide(new BigDecimal(100)); + BigDecimal chajiaVipMoney = chajiaTechnicianMoney.multiply(orders.getVipRate()).divide(new BigDecimal(100)); chajiaVipMoney = chajiaVipMoney.setScale(0,BigDecimal.ROUND_UP); - BigDecimal chajiaVipReductionMoney = chajia.subtract(chajiaVipMoney); + BigDecimal chajiaVipReductionMoney = chajiaTechnicianMoney.subtract(chajiaVipMoney); orders.setVipReductionMoney(chajiaVipReductionMoney); - //项目价格 = 原金额+技师加成金额-会员减免金额 - BigDecimal massagePrice = chajia.add(chajiaTechnicianMoney).subtract(chajiaVipReductionMoney).setScale(0,BigDecimal.ROUND_UP); + //项目价格 = 会员金额 + BigDecimal massagePrice = chajiaVipMoney; orders.setMassageMoney(massagePrice); orders.setPayMoney(massagePrice);//差价 @@ -1659,13 +1659,13 @@ public class OrdersServiceImpl extends ServiceImpl implements orders.setPriceMarkup(priceMarkup); //会员优惠后金额，及会员减免金额 - BigDecimal vipMoney = price.multiply(orders.getVipRate()).divide(new BigDecimal(100)); + BigDecimal vipMoney = priceMarkup.multiply(orders.getVipRate()).divide(new BigDecimal(100)); vipMoney = vipMoney.setScale(0,BigDecimal.ROUND_UP); - BigDecimal vipReductionMoney = price.subtract(vipMoney); + BigDecimal vipReductionMoney = priceMarkup.subtract(vipMoney); orders.setVipReductionMoney(vipReductionMoney); - //项目价格 = 原金额+技师加成金额-会员减免金额 - BigDecimal payMoney = price.add(technicianMoney).subtract(vipReductionMoney).setScale(0,BigDecimal.ROUND_UP); + //项目价格 = 会员金额 + BigDecimal payMoney = vipMoney; orders.setMassageMoney(payMoney); //项目差价