From 2efc66292e74967ecf9fda710187ea35f541ad56 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sat, 17 Jan 2026 01:57:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(order):=20=E4=BF=AE=E5=A4=8D=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E4=BD=BF=E7=94=A8=E8=AF=B7=E6=B1=82=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E6=99=AF=E5=8C=BAID=E8=AE=BE=E7=BD=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将优惠券使用请求中的景区ID从缓存结果字符串改为订单实际景区ID
- 添加空值检查以避免潜在的空指针异常
- 确保景区ID正确传递为字符串格式
---
 .../java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java
index 702e2423..cdc584d4 100644
--- a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java
@@ -998,7 +998,7 @@ public class OrderServiceImpl implements OrderService {
             couponUseRequest.setOrderId(order.getId().toString());
             couponUseRequest.setOriginalAmount(cachedResult.getOriginalAmount());
             couponUseRequest.setDiscountAmount(cachedResult.getUsedCoupon().getActualDiscountAmount());
-            couponUseRequest.setScenicId(cachedResult.toString());
+            couponUseRequest.setScenicId(order.getScenicId() != null ? order.getScenicId().toString() : null);
             iCouponService.useCoupon(couponUseRequest);
         }
         if (cachedResult.getUsedVoucher() != null) {