会员整单折扣
This commit is contained in:
@@ -264,7 +264,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional
|
@Transactional
|
||||||
public OrderInfo createOrder(OrderInfoAddDTO param) throws ValidateException{
|
public OrderInfo createOrder(OrderInfoAddDTO param) throws ValidateException {
|
||||||
ShopInfo shopInfo = shopInfoService.getById(param.getShopId());
|
ShopInfo shopInfo = shopInfoService.getById(param.getShopId());
|
||||||
AssertUtil.isNull(shopInfo, "生成订单失败,店铺信息不存在");
|
AssertUtil.isNull(shopInfo, "生成订单失败,店铺信息不存在");
|
||||||
if (!shopInfo.getEatModel().contains(param.getDineMode())) {
|
if (!shopInfo.getEatModel().contains(param.getDineMode())) {
|
||||||
@@ -524,11 +524,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|||||||
支付计算金额不正确,
|
支付计算金额不正确,
|
||||||
订单Id:{},支付计算金额为:{},商品总金额:{},临时菜价格:{},打包费:{},餐位费:{},
|
订单Id:{},支付计算金额为:{},商品总金额:{},临时菜价格:{},打包费:{},餐位费:{},
|
||||||
传递支付金额为:{},商品券:{},其它券:{},新客立减:{},满减活动:{},
|
传递支付金额为:{},商品券:{},其它券:{},新客立减:{},满减活动:{},
|
||||||
商家最终改价:{},积分抵扣金额:{},抹零金额:{}
|
超级会员折扣金额:{},商家最终改价:{},积分抵扣金额:{},抹零金额:{}
|
||||||
""",
|
""",
|
||||||
orderInfo.getId(), newTotalAmount, totalAmount.getPrice(), tempAmount.getPrice(), packAmount.getPrice(), orderInfo.getSeatAmount(),
|
orderInfo.getId(), newTotalAmount, totalAmount.getPrice(), tempAmount.getPrice(), packAmount.getPrice(), orderInfo.getSeatAmount(),
|
||||||
param.getOrderAmount(), param.getProductCouponDiscountAmount(), param.getOtherCouponDiscountAmount(), param.getNewCustomerDiscountAmount(),
|
param.getOrderAmount(), param.getProductCouponDiscountAmount(), param.getOtherCouponDiscountAmount(), param.getNewCustomerDiscountAmount(),
|
||||||
discountActAmount, param.getDiscountAmount(), param.getPointsDiscountAmount(), param.getRoundAmount());
|
discountActAmount, param.getVipDiscountAmount(), param.getDiscountAmount(), param.getPointsDiscountAmount(), param.getRoundAmount());
|
||||||
throw new OrderValidateException("生成支付订单失败,支付金额不正确");
|
throw new OrderValidateException("生成支付订单失败,支付金额不正确");
|
||||||
}
|
}
|
||||||
orderInfo.setPackFee(packAmount.getPrice());
|
orderInfo.setPackFee(packAmount.getPrice());
|
||||||
|
|||||||
Reference in New Issue
Block a user