临时菜
This commit is contained in:
@@ -477,7 +477,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|||||||
throw new ValidateException("生成支付订单失败,商品优惠券优惠金额不正确");
|
throw new ValidateException("生成支付订单失败,商品优惠券优惠金额不正确");
|
||||||
}
|
}
|
||||||
orderInfo.setOriginAmount(param.getOriginAmount());
|
orderInfo.setOriginAmount(param.getOriginAmount());
|
||||||
//总商品支付金额 不包含打包费 不包含临时菜 用来计算后续
|
//总商品支付金额 不包含打包费 用来计算后续
|
||||||
BigDecimal newTotalAmount = totalAmount.getPrice();
|
BigDecimal newTotalAmount = totalAmount.getPrice();
|
||||||
|
|
||||||
//减去商品优惠券
|
//减去商品优惠券
|
||||||
@@ -496,7 +496,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|||||||
newTotalAmount = BigDecimal.ZERO;
|
newTotalAmount = BigDecimal.ZERO;
|
||||||
}
|
}
|
||||||
//优惠券金额结束 (商品金额+打包费+餐位费)
|
//优惠券金额结束 (商品金额+打包费+餐位费)
|
||||||
newTotalAmount = newTotalAmount.add(packAmount.getPrice()).add(orderInfo.getSeatAmount()).add(tempAmount.getPrice());
|
newTotalAmount = newTotalAmount.add(packAmount.getPrice()).add(orderInfo.getSeatAmount());
|
||||||
|
|
||||||
//新客立减
|
//新客立减
|
||||||
if (shopUser != null) {
|
if (shopUser != null) {
|
||||||
|
|||||||
Reference in New Issue
Block a user