From 52902296092c297aa262a4632a8bfb4837644f8e Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Sat, 11 Oct 2025 17:18:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=20=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/OrderInfoServiceImpl.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index c541c95d..f7d5a26b 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -477,6 +477,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     fullReductionAmount.getPrice(), rateAmount.getPrice(), oneGiftAmount.getPrice(), twoHalfAmount.getPrice(), param.getOtherCouponDiscountAmount());
             throw new ValidateException("生成支付订单失败，其它优惠券金额不正确");
         }
+        if (newTotalAmount.compareTo(BigDecimal.ZERO) <= 0) {
+            newTotalAmount = BigDecimal.ZERO;
+        }
+        //优惠券金额结束 （商品金额+打包费+餐位费）
+        newTotalAmount = newTotalAmount.add(packAmount.getPrice()).add(orderInfo.getSeatAmount());
         //新客立减
         if (shopUser != null) {
             newTotalAmount = newTotalAmount.subtract(param.getNewCustomerDiscountAmount());
@@ -506,16 +511,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         if (newTotalAmount.compareTo(BigDecimal.ZERO) <= 0) {
             newTotalAmount = BigDecimal.ZERO;
         }
-        //校验最终金额（订单金额 (扣除各类折扣)+打包费 餐位费）
-        newTotalAmount = newTotalAmount.add(packAmount.getPrice()).add(orderInfo.getSeatAmount());
-        if (newTotalAmount.compareTo(BigDecimal.ZERO) <= 0) {
-            newTotalAmount = BigDecimal.ZERO;
-        }
         if (newTotalAmount.compareTo(param.getOrderAmount()) != 0) {
-            log.info("支付计算金额不正确，订单Id:{},最终计算金额为：{},打包费：{}，餐位费：{},积分抵扣金额：{},抹零金额：{}",
+            log.info("支付计算金额不正确，订单Id:{},支付计算金额为：{},打包费：{}，餐位费：{},折扣金额:{},积分抵扣金额：{},抹零金额：{}",
                     orderInfo.getId(), newTotalAmount, packAmount.getPrice(), orderInfo.getSeatAmount(),
-                    param.getPointsDiscountAmount(), param.getRoundAmount());
-            throw new ValidateException("生成支付订单失败，订单金额不正确");
+                    param.getDiscountAmount(), param.getPointsDiscountAmount(), param.getRoundAmount());
+            throw new ValidateException("生成支付订单失败，支付金额不正确");
         }
         orderInfo.setPackFee(packAmount.getPrice());
         //生成订单 //discount_info 所有折扣 几折 折扣金额 满减金额 优惠券金额 积分抵扣金额 抹零