czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

临时菜

This commit is contained in:
wangw 2025-10-15 16:14:27 +08:00
parent 59a16d15b7
commit 57dd228b91
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
View File

@ -472,12 +472,12 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
}); });
} }
//总商品支付金额 不包含打包费 用来计算后续
if (prodCouponAmount.getPrice().compareTo(param.getProductCouponDiscountAmount()) != 0) { if (prodCouponAmount.getPrice().compareTo(param.getProductCouponDiscountAmount()) != 0) {
log.info("支付计算金额不正确：商品券抵扣金额为：{}，传递为：{}", prodCouponAmount.getPrice(), param.getProductCouponDiscountAmount()); log.info("支付计算金额不正确：商品券抵扣金额为：{}，传递为：{}", prodCouponAmount.getPrice(), param.getProductCouponDiscountAmount());
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()); newTotalAmount = newTotalAmount.add(packAmount.getPrice()).add(orderInfo.getSeatAmount()).add(tempAmount.getPrice());
//新客立减 //新客立减
if (shopUser != null) { if (shopUser != null) {
@ -536,11 +536,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
} }
if (newTotalAmount.compareTo(param.getOrderAmount()) != 0) { if (newTotalAmount.compareTo(param.getOrderAmount()) != 0) {
log.info(""" log.info("""
支付计算金额不正确，订单Id:{},支付计算金额为:{},商品总金额:{},打包费:{}，餐位费:{}, 支付计算金额不正确，订单Id:{},支付计算金额为:{},商品总金额:{},临时菜价格:{},打包费:{}，餐位费:{},
传递支付金额为:{},商品券:{},其它券:{},新客立减:{},满减活动:{}, 传递支付金额为:{},商品券:{},其它券:{},新客立减:{},满减活动:{},
商家最终改价:{},积分抵扣金额:{},抹零金额:{} 商家最终改价:{},积分抵扣金额:{},抹零金额:{}
""", """,
orderInfo.getId(), newTotalAmount, totalAmount.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.getDiscountAmount(), param.getPointsDiscountAmount(), param.getRoundAmount());
throw new ValidateException("生成支付订单失败，支付金额不正确"); throw new ValidateException("生成支付订单失败，支付金额不正确");