From 1d5e4562f28c90f166d0123e844fb539179bab6c Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Mon, 1 Sep 2025 17:11:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(biz):=20=E4=BF=AE=E5=A4=8D=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E5=AE=9D=E5=95=86=E5=93=81=E9=A2=84=E8=A7=88=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-增加对 face 对象非空的判断，提高代码健壮性
- 修改 faceId 的设置逻辑，使用 goodsId 替代，确保正确传递参数
---
 src/main/java/com/ycwl/basic/biz/OrderBiz.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/biz/OrderBiz.java b/src/main/java/com/ycwl/basic/biz/OrderBiz.java
index 4a2751a..18504b0 100644
--- a/src/main/java/com/ycwl/basic/biz/OrderBiz.java
+++ b/src/main/java/com/ycwl/basic/biz/OrderBiz.java
@@ -136,8 +136,10 @@ public class OrderBiz {
                 productItem.setPurchaseCount(1);
                 productItem.setScenicId(scenic.getId().toString());
                 calculationRequest.setProducts(Collections.singletonList(productItem));
-                calculationRequest.setUserId(face.getMemberId());
-                calculationRequest.setFaceId(face.getId());
+                if (face != null) {
+                    calculationRequest.setUserId(face.getMemberId());
+                }
+                calculationRequest.setFaceId(goodsId);
                 PriceCalculationResult priceCalculationResult = iPriceCalculationService.calculatePrice(calculationRequest);
                 priceObj.setPrice(priceCalculationResult.getFinalAmount());
                 priceObj.setSlashPrice(priceCalculationResult.getOriginalAmount());