项目升级
This commit is contained in:
parent
716843fe6b
commit
24552db0ba
|
@ -1513,7 +1513,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> 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<OrdersDao, Orders> 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;
|
||||
|
|
Loading…
Reference in New Issue