From 91df76ef95c9929b1ed1d87516151f0611e48cc2 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 20:27:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95massagePrice=E6=94=B9?= =?UTF-8?q?=E6=88=90=E5=90=88=E8=AE=A1=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artificer/service/impl/OrdersServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 168a209..fc2c147 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 @@ -364,10 +364,10 @@ public class OrdersServiceImpl extends ServiceImpl implements BigDecimal artificerPrice = new BigDecimal("0.00"); for (OrdersMassage ordersMassage : ordersMassageList) { - orders.setMassagePrice(massageType.getPrice()); orders.setDuration(massageType.getDuration()); orders.setMassageNum(ordersMassage.getNum()); price = massageType.getPrice().multiply(BigDecimal.valueOf(ordersMassage.getNum())); + orders.setMassagePrice(price); BigDecimal massagePrice = price.multiply(orders.getTechnicianRate()).divide(new BigDecimal(100)).add(price);//技师等级加成金额 massagePrice = massagePrice.multiply(orders.getVipRate()).divide(new BigDecimal(100));//会员优惠后金额 massageTypeName = massageType.getTitle(); @@ -672,11 +672,11 @@ public class OrdersServiceImpl extends ServiceImpl implements BigDecimal artificerPrice = new BigDecimal("0.00"); for (OrdersMassage ordersMassage : ordersMassageList) { - orders.setMassagePrice(userPackageDetail.getPrice()); orders.setDuration(userPackageDetail.getDuration()); orders.setMassageNum(ordersMassage.getNum()); price = userPackageDetail.getPrice().multiply(BigDecimal.valueOf(ordersMassage.getNum())); packagePrice = userPackageDetail.getPackagePrice().multiply(BigDecimal.valueOf(ordersMassage.getNum())); + orders.setMassagePrice(packagePrice); massageTypeName = userPackageDetail.getTitle(); payMoney = packagePrice.add(payMoney); @@ -1201,11 +1201,11 @@ public class OrdersServiceImpl extends ServiceImpl implements massageTypeId = ordersMassageList.get(0).getMassageId(); MassageType massageType = massageTypeService.getById(massageTypeId); for (OrdersMassage ordersMassage : ordersMassageList) { - orders.setMassagePrice(massageType.getPrice()); orders.setDuration(massageType.getDuration()); orders.setMassageNum(ordersMassage.getNum()); price = massageType.getPrice().multiply(BigDecimal.valueOf(ordersMassage.getNum())); } + orders.setMassagePrice(price); orders.setPrice(price); orders.setMassageTypeId(massageTypeId); orders.setEntryName(massageType.getTitle()); @@ -1248,6 +1248,7 @@ public class OrdersServiceImpl extends ServiceImpl implements orders.setOldMassageNum(oldOrders.getMassageNum()); orders.setOldMassageDuration(oldOrders.getDuration()); orders.setOldArtificerMoney(oldOrders.getArtificerMoney()); + orders.setArtificerTaxiMoney(oldOrders.getArtificerTaxiMoney()); //获取用户VIP的优惠信息 BigDecimal vipRate = new BigDecimal(100); @@ -1613,6 +1614,7 @@ public class OrdersServiceImpl extends ServiceImpl implements orders.setMassageTypeId(massageType.getMassageTypeId()); } //保存现价 + orders.setMassagePrice(price); orders.setPrice(price); orders.setEntryName(massageTypeName); @@ -1821,11 +1823,11 @@ public class OrdersServiceImpl extends ServiceImpl implements massageTypeId = ordersMassageList.get(0).getMassageId(); massageType = massageTypeService.getById(massageTypeId); for (OrdersMassage ordersMassage : ordersMassageList) { - orders.setMassagePrice(massageType.getPrice()); orders.setDuration(massageType.getDuration()); orders.setMassageNum(ordersMassage.getNum()); price = massageType.getPrice().multiply(BigDecimal.valueOf(ordersMassage.getNum())); } + orders.setMassagePrice(price); orders.setMassageTypeId(massageTypeId); orders.setEntryName(massageType.getTitle()); //判断新price是否大于旧price