桌位费问题
This commit is contained in:
parent
4726aab7b5
commit
80a47a6f97
|
|
@ -201,9 +201,13 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|||
if (packAmount.getPrice().compareTo(param.getPackFee()) != 0) {
|
||||
throw new ValidateException("生成订单失败,打包费不正确");
|
||||
}
|
||||
log.info("下单3 打包费{} 金额{}", param.getPackFee(), param.getOriginAmount());
|
||||
BigDecimal seatAmount = BigDecimal.ZERO;
|
||||
if (shopInfo.getIsTableFee().equals(0)) {
|
||||
seatAmount = shopInfo.getTableFee().multiply(new BigDecimal(param.getSeatNum()));
|
||||
}
|
||||
log.info("下单3 打包费{} 餐位费{} 金额{}", param.getPackFee(), seatAmount, param.getOriginAmount());
|
||||
//总金额
|
||||
if (totalAmount.add(param.getPackFee()).compareTo(param.getOriginAmount()) != 0) {
|
||||
if (totalAmount.add(param.getPackFee()).add(seatAmount).compareTo(param.getOriginAmount()) != 0) {
|
||||
throw new ValidateException("生成订单失败,订单金额不正确");
|
||||
}
|
||||
//生成订单
|
||||
|
|
@ -629,7 +633,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|||
orderInfo.setSeatNum(param.getSeatNum());
|
||||
}
|
||||
orderInfo.setPlaceNum(param.getPlaceNum());
|
||||
orderInfo.setOriginAmount(orderInfo.getOriginAmount().add(param.getOriginAmount()).add(orderInfo.getSeatAmount()));
|
||||
orderInfo.setOriginAmount(orderInfo.getOriginAmount().add(param.getOriginAmount()));
|
||||
orderInfo.setOrderAmount(orderInfo.getOriginAmount());
|
||||
orderInfo.setPackFee(orderInfo.getPackFee().add(param.getPackFee()));
|
||||
orderInfo.setRoundAmount(BigDecimal.ZERO);
|
||||
|
|
|
|||
Loading…
Reference in New Issue