From 827cc937e10c44b80be0c12c592eee5201e84d42 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 27 Oct 2025 16:58:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BB=A1=E5=87=8F=E9=87=91=E9=A2=9D=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A4=90=E4=BD=8D=E8=B4=B9=E5=92=8C=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/order/service/impl/OrderInfoServiceImpl.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 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 54984a963..8d0e7305d 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
@@ -473,7 +473,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             param.setNewCustomerDiscountAmount(BigDecimal.ZERO);
         }
         //满减活动
-        BigDecimal discountActAmount = calculateDiscountActAmount(orderDetails, discountAct);
+        BigDecimal discountActAmount = calculateDiscountActAmount(orderDetails, discountAct, packAmount.getPrice(), orderInfo.getSeatAmount());
         if (discountActAmount.compareTo(param.getDiscountActAmount()) != 0) {
             log.info("满减活动金额不正确：传递为：{}，计算为：{}", param.getDiscountActAmount(), discountActAmount);
             throw new ValidateException("生成支付订单失败，满减活动金额不正确");
@@ -909,7 +909,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     /**
      * 满减活动 校验门槛获取减免金额
      */
-    private BigDecimal calculateDiscountActAmount(List<OrderDetail> orderDetails, MkDiscountActivityDTO discountAct) {
+    private BigDecimal calculateDiscountActAmount(List<OrderDetail> orderDetails, MkDiscountActivityDTO discountAct, BigDecimal packPrice, BigDecimal seatPrice) {
         if (discountAct == null) {
             return BigDecimal.ZERO;
         }
@@ -920,7 +920,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             originalPrice = originalPrice.add(orderDetail.getPayAmount());
         }
-        log.info("满减活动门槛金额计算为:{}", originalPrice);
+        originalPrice = originalPrice.add(packPrice).add(seatPrice);
         for (MkDiscountThreshold threshold : discountAct.getThresholds()) {
             if (originalPrice.compareTo(threshold.getFullAmount()) >= 0) {
                 return threshold.getDiscountAmount();