套餐修改单据加成计算
This commit is contained in:
parent
b24049c84f
commit
b0a346ec04
|
@ -1668,6 +1668,16 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
}
|
}
|
||||||
orders.setVipRate(vipRate);
|
orders.setVipRate(vipRate);
|
||||||
|
|
||||||
|
if(orders.getUserPackageDetailId() != null) {
|
||||||
|
//技师加成金额
|
||||||
|
orders.setTechnicianMoney(BigDecimal.ZERO);
|
||||||
|
//技师加成后总额
|
||||||
|
orders.setPriceMarkup(price);
|
||||||
|
//会员优惠后金额,及会员减免金额
|
||||||
|
orders.setVipReductionMoney(BigDecimal.ZERO);
|
||||||
|
//项目价格 = 会员金额
|
||||||
|
orders.setMassageMoney(price);
|
||||||
|
}else{
|
||||||
//技师加成金额
|
//技师加成金额
|
||||||
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);
|
||||||
|
@ -1687,6 +1697,8 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
//项目价格 = 会员金额
|
//项目价格 = 会员金额
|
||||||
BigDecimal payMoney = vipMoney;
|
BigDecimal payMoney = vipMoney;
|
||||||
orders.setMassageMoney(payMoney);
|
orders.setMassageMoney(payMoney);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
//项目差价
|
//项目差价
|
||||||
BigDecimal xmchajia = orders.getMassageMoney().subtract(oldOrders.getMassageMoney());
|
BigDecimal xmchajia = orders.getMassageMoney().subtract(oldOrders.getMassageMoney());
|
||||||
|
|
Loading…
Reference in New Issue