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

商品券 不抵扣临时菜

Browse Source
This commit is contained in:
wangw
2025-10-15 16:10:32 +08:00
parent 95f3e11250
commit 59a16d15b7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -536,10 +536,10 @@ 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(), 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());
@@ -675,7 +675,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
// log.info("商品券 计算 orderDetails:{}", orderDetails); // log.info("商品券 计算 orderDetails:{}", orderDetails);
BigDecimal remaining = new BigDecimal(discountNum); BigDecimal remaining = new BigDecimal(discountNum);
for (OrderDetail detail : orderDetails) { for (OrderDetail detail : orderDetails) {
if ((isAllFoods || couponFoodIds.contains(detail.getProductId())) && detail.getUnitPrice().compareTo(BigDecimal.ZERO) > 0) { if (detail.getIsTemporary() != 1 && (isAllFoods || couponFoodIds.contains(detail.getProductId())) && detail.getUnitPrice().compareTo(BigDecimal.ZERO) > 0) {
if (remaining.compareTo(BigDecimal.ZERO) > 0) { if (remaining.compareTo(BigDecimal.ZERO) > 0) {
if (remaining.compareTo(detail.getNum().subtract(detail.getReturnNum())) >= 0) { if (remaining.compareTo(detail.getNum().subtract(detail.getReturnNum())) >= 0) {
detail.setCouponNum(detail.getNum().subtract(detail.getReturnNum()).setScale(2, RoundingMode.CEILING)); detail.setCouponNum(detail.getNum().subtract(detail.getReturnNum()).setScale(2, RoundingMode.CEILING));