From 24552db0ba9cf209169f4254b603d67ad95654e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Mon, 22 Jul 2024 20:23:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrdersServiceImpl.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 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 f22b5bc..0e1ee48 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 @@ -1513,7 +1513,7 @@ public class OrdersServiceImpl extends ServiceImpl implements //技师加成金额 BigDecimal technicianMoney = price.multiply(orders.getTechnicianRate()).divide(new BigDecimal(100)); technicianMoney = technicianMoney.setScale(0,BigDecimal.ROUND_UP); -// orders.setTechnicianMoney(technicianMoney); + orders.setTechnicianMoney(technicianMoney); //技师加成后总额 BigDecimal priceMarkup = technicianMoney.add(price); priceMarkup = priceMarkup.setScale(0,BigDecimal.ROUND_UP); @@ -1523,20 +1523,20 @@ public class OrdersServiceImpl extends ServiceImpl implements BigDecimal vipMoney = priceMarkup.multiply(orders.getVipRate()).divide(new BigDecimal(100)); vipMoney = vipMoney.setScale(0,BigDecimal.ROUND_UP); BigDecimal vipReductionMoney = priceMarkup.subtract(vipMoney); -// orders.setVipReductionMoney(vipReductionMoney); + orders.setVipReductionMoney(vipReductionMoney); - BigDecimal chajia = orders.getMassagePrice().subtract(oldOrders.getMassagePrice()); + BigDecimal chajia = orders.getPriceMarkup().subtract(oldOrders.getPriceMarkup()); - BigDecimal chajiaTechnicianMoney = chajia.multiply(orders.getTechnicianRate()).divide(new BigDecimal(100)); - chajiaTechnicianMoney = chajiaTechnicianMoney.setScale(0,BigDecimal.ROUND_UP); - orders.setTechnicianMoney(chajiaTechnicianMoney); +// BigDecimal chajiaTechnicianMoney = chajia.multiply(orders.getTechnicianRate()).divide(new BigDecimal(100)); +// chajiaTechnicianMoney = chajiaTechnicianMoney.setScale(0,BigDecimal.ROUND_UP); +// orders.setTechnicianMoney(chajiaTechnicianMoney); - BigDecimal chajiaPriceMarkup = chajiaTechnicianMoney.add(chajia); +// BigDecimal chajiaPriceMarkup = chajiaTechnicianMoney.add(chajia); - BigDecimal chajiaVipMoney = chajiaPriceMarkup.multiply(orders.getVipRate()).divide(new BigDecimal(100)); + BigDecimal chajiaVipMoney = chajia.multiply(orders.getVipRate()).divide(new BigDecimal(100)); chajiaVipMoney = chajiaVipMoney.setScale(0,BigDecimal.ROUND_UP); - BigDecimal chajiaVipReductionMoney = chajiaPriceMarkup.subtract(chajiaVipMoney); - orders.setVipReductionMoney(chajiaVipReductionMoney); + BigDecimal chajiaVipReductionMoney = chajia.subtract(chajiaVipMoney); +// orders.setVipReductionMoney(chajiaVipReductionMoney); //项目价格 = 会员金额 BigDecimal massagePrice = chajiaVipMoney;