订单massagePrice改成合计价格
This commit is contained in:
parent
d7547acf8f
commit
91df76ef95
|
@ -364,10 +364,10 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> 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<OrdersDao, Orders> 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<OrdersDao, Orders> 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<OrdersDao, Orders> 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<OrdersDao, Orders> implements
|
|||
orders.setMassageTypeId(massageType.getMassageTypeId());
|
||||
}
|
||||
//保存现价
|
||||
orders.setMassagePrice(price);
|
||||
orders.setPrice(price);
|
||||
orders.setEntryName(massageTypeName);
|
||||
|
||||
|
@ -1821,11 +1823,11 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> 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
|
||||
|
|
Loading…
Reference in New Issue