From 1fbe7c86d5647245358c27d8ed11dacadde1823d Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Mon, 8 Sep 2025 11:29:31 +0800
Subject: [PATCH] =?UTF-8?q?fix(mobile):=20=E4=BF=AE=E5=A4=8D=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E6=99=AF=E5=8C=BA?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 GoodsServiceImpl 中添加 scenicRepository 以获取景区信息
- 在 goodsPageVO 和 goodsDetailVO 中使用 scenicRepository 获取正确的景区名称
- 添加异常处理，确保在获取景区信息失败时不会影响页面显示
---
 .../service/mobile/impl/GoodsServiceImpl.java | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java
index 0a2c89d..9fd9bc3 100644
--- a/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java
@@ -3,6 +3,8 @@ package com.ycwl.basic.service.mobile.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.extra.qrcode.QrCodeUtil;
 import cn.hutool.http.HttpUtil;
+import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2DTO;
+import com.ycwl.basic.model.pc.scenic.entity.ScenicEntity;
 import com.ycwl.basic.utils.JacksonUtil;
 import com.ycwl.basic.biz.CouponBiz;
 import com.ycwl.basic.biz.OrderBiz;
@@ -117,7 +119,12 @@ public class GoodsServiceImpl implements GoodsService {
             GoodsPageVO goodsPageVO = new GoodsPageVO();
             goodsPageVO.setGoodsName(videoRespVO.getTemplateName());
             goodsPageVO.setScenicId(videoRespVO.getScenicId());
-            goodsPageVO.setScenicName(videoRespVO.getScenicName());
+            try {
+                ScenicV2DTO scenic = scenicRepository.getScenicBasic(videoRespVO.getScenicId());
+                goodsPageVO.setScenicName(scenic.getName());
+            } catch (Exception e) {
+                goodsPageVO.setScenicName("");
+            }
             goodsPageVO.setGoodsType(0);
             goodsPageVO.setFaceId(videoRespVO.getFaceId());
             goodsPageVO.setGoodsId(videoRespVO.getId());
@@ -206,7 +213,12 @@ public class GoodsServiceImpl implements GoodsService {
                 goodsDetailVO.setGoodsName(goodsNamePrefix + i + " " + shootingTime);
             }
             goodsDetailVO.setScenicId(sourceRespVO.getScenicId());
-            goodsDetailVO.setScenicName(sourceRespVO.getScenicName());
+            try {
+                ScenicV2DTO scenic = scenicRepository.getScenicBasic(sourceRespVO.getScenicId());
+                goodsDetailVO.setScenicName(scenic.getName());
+            } catch (Exception e) {
+                goodsDetailVO.setScenicName("");
+            }
             goodsDetailVO.setGoodsType(sourceType);
             goodsDetailVO.setFaceId(face.getId());
             goodsDetailVO.setGoodsId(sourceRespVO.getId());
@@ -245,7 +257,12 @@ public class GoodsServiceImpl implements GoodsService {
         }
         goodsDetailVO.setGoodsName(videoRespVO.getTemplateName());
         goodsDetailVO.setScenicId(videoRespVO.getScenicId());
-        goodsDetailVO.setScenicName(videoRespVO.getScenicName());
+        try {
+            ScenicV2DTO scenic = scenicRepository.getScenicBasic(videoRespVO.getScenicId());
+            goodsDetailVO.setScenicName(scenic.getName());
+        } catch (Exception e) {
+            goodsDetailVO.setScenicName("");
+        }
         goodsDetailVO.setGoodsType(0);
         goodsDetailVO.setGoodsId(videoRespVO.getId());
         goodsDetailVO.setVideoUrl(videoRespVO.getVideoUrl());
@@ -503,7 +520,12 @@ public class GoodsServiceImpl implements GoodsService {
         GoodsDetailVO goodsDetailVO = new GoodsDetailVO();
         goodsDetailVO.setGoodsName("原片");
         goodsDetailVO.setScenicId(sourceRespVO.getScenicId());
-        goodsDetailVO.setScenicName(sourceRespVO.getScenicName());
+        try {
+            ScenicV2DTO scenic = scenicRepository.getScenicBasic(sourceRespVO.getScenicId());
+            goodsDetailVO.setScenicName(scenic.getName());
+        } catch (Exception e) {
+            goodsDetailVO.setScenicName("");
+        }
         goodsDetailVO.setGoodsType(sourceRespVO.getType());
         goodsDetailVO.setGoodsId(sourceRespVO.getId());
         if (sourceRespVO.getVideoUrl() != null) {