From a1b0687526f745ead7ad396fa42ba623ee8d950b Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sat, 15 Nov 2025 14:52:53 +0800
Subject: [PATCH] =?UTF-8?q?feat(pricing):=20=E6=B7=BB=E5=8A=A0=E6=8A=98?=
 =?UTF-8?q?=E6=89=A3=E4=BC=98=E5=85=88=E7=BA=A7=E8=AE=BE=E7=BD=AE=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=B7=E6=A0=BC=E8=AE=A1=E7=AE=97=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在折扣信息中增加优先级字段，提升折扣策略的灵活性
- 为价格计算请求默认启用自动使用优惠券功能
- 设置价格预览模式为非预览状态，确保实际计算准确性
- 完善打印服务中的价格计算逻辑，提高系统稳定性
---
 .../pricing/service/impl/OnePricePurchaseDiscountProvider.java | 1 +
 .../ycwl/basic/service/printer/impl/PrinterServiceImpl.java    | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/main/java/com/ycwl/basic/pricing/service/impl/OnePricePurchaseDiscountProvider.java b/src/main/java/com/ycwl/basic/pricing/service/impl/OnePricePurchaseDiscountProvider.java
index 1c069a6a..ed7f0b5b 100644
--- a/src/main/java/com/ycwl/basic/pricing/service/impl/OnePricePurchaseDiscountProvider.java
+++ b/src/main/java/com/ycwl/basic/pricing/service/impl/OnePricePurchaseDiscountProvider.java
@@ -83,6 +83,7 @@ public class OnePricePurchaseDiscountProvider implements IDiscountProvider {
             discountInfo.setDiscountAmount(onePriceInfo.getActualDiscountAmount());
             discountInfo.setDiscountDescription("景区一口价购买，价格更优惠");
             discountInfo.setOnePriceInfo(onePriceInfo);
+            discountInfo.setPriority(getPriority());
             
             discounts.add(discountInfo);
             
diff --git a/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java b/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java
index 090ac1b9..94b16a28 100644
--- a/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java
@@ -454,6 +454,7 @@ public class PrinterServiceImpl implements PrinterService {
                         memberId, faceId, scenicId, e.getMessage());
             }
         }
+        request.setAutoUseCoupon(true);
 
         // 使用统一价格计算服务
         PriceCalculationResult result = priceCalculationService.calculatePrice(request);
@@ -669,6 +670,8 @@ public class PrinterServiceImpl implements PrinterService {
         }
 
         request.setProducts(productItems);
+        request.setAutoUseCoupon(true);
+        request.setPreviewOnly(false);
 
         PriceCalculationResult priceResult = priceCalculationService.calculatePrice(request);