yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

项目升级

This commit is contained in:
曹磊 2024-07-22 20:23:26 +08:00
parent 716843fe6b
commit 24552db0ba
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
View File

@ -1513,7 +1513,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
//技师加成金额 //技师加成金额
BigDecimal technicianMoney = price.multiply(orders.getTechnicianRate()).divide(new BigDecimal(100)); BigDecimal technicianMoney = price.multiply(orders.getTechnicianRate()).divide(new BigDecimal(100));
technicianMoney = technicianMoney.setScale(0,BigDecimal.ROUND_UP); technicianMoney = technicianMoney.setScale(0,BigDecimal.ROUND_UP);
// orders.setTechnicianMoney(technicianMoney); orders.setTechnicianMoney(technicianMoney);
//技师加成后总额 //技师加成后总额
BigDecimal priceMarkup = technicianMoney.add(price); BigDecimal priceMarkup = technicianMoney.add(price);
priceMarkup = priceMarkup.setScale(0,BigDecimal.ROUND_UP); priceMarkup = priceMarkup.setScale(0,BigDecimal.ROUND_UP);
@ -1523,20 +1523,20 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
BigDecimal vipMoney = priceMarkup.multiply(orders.getVipRate()).divide(new BigDecimal(100)); BigDecimal vipMoney = priceMarkup.multiply(orders.getVipRate()).divide(new BigDecimal(100));
vipMoney = vipMoney.setScale(0,BigDecimal.ROUND_UP); vipMoney = vipMoney.setScale(0,BigDecimal.ROUND_UP);
BigDecimal vipReductionMoney = priceMarkup.subtract(vipMoney); 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)); // BigDecimal chajiaTechnicianMoney = chajia.multiply(orders.getTechnicianRate()).divide(new BigDecimal(100));
chajiaTechnicianMoney = chajiaTechnicianMoney.setScale(0,BigDecimal.ROUND_UP); // chajiaTechnicianMoney = chajiaTechnicianMoney.setScale(0,BigDecimal.ROUND_UP);
orders.setTechnicianMoney(chajiaTechnicianMoney); // 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); chajiaVipMoney = chajiaVipMoney.setScale(0,BigDecimal.ROUND_UP);
BigDecimal chajiaVipReductionMoney = chajiaPriceMarkup.subtract(chajiaVipMoney); BigDecimal chajiaVipReductionMoney = chajia.subtract(chajiaVipMoney);
orders.setVipReductionMoney(chajiaVipReductionMoney); // orders.setVipReductionMoney(chajiaVipReductionMoney);
//项目价格 = 会员金额 //项目价格 = 会员金额
BigDecimal massagePrice = chajiaVipMoney; BigDecimal massagePrice = chajiaVipMoney;