From c33f169614f95c0daeec3815933eb863432c77fb Mon Sep 17 00:00:00 2001
From: gong <1157756119@qq.com>
Date: Sat, 20 Dec 2025 09:20:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A5=97=E9=A4=90=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=20=E5=A2=9E=E5=8A=A0=20shopId=20=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/controller/user/UPpPackageController.java   | 4 ++--
 .../main/java/com/czg/market/service/PpPackageService.java   | 2 +-
 .../service/market/service/impl/PpPackageServiceImpl.java    | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java
index 84ec6b0b2..01b978a22 100644
--- a/cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java
+++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java
@@ -58,8 +58,8 @@ public class UPpPackageController {
      * 获取套餐详情
      */
     @GetMapping("/detail/{id}")
-    public CzgResult<PpPackageVO> getPackageDetail(@PathVariable Long id) {
-        return CzgResult.success(ppPackageService.getPackageDetail(id));
+    public CzgResult<PpPackageVO> getPackageDetail(@PathVariable Long id, Long shopId) {
+        return CzgResult.success(ppPackageService.getPackageDetail(id, shopId));
     }
 
     /**
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/PpPackageService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/PpPackageService.java
index a03782f2d..d75391e9d 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/PpPackageService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/PpPackageService.java
@@ -48,7 +48,7 @@ public interface PpPackageService extends IService<PpPackage> {
 
     PpPackage getPackageById(Long id);
 
-    PpPackageVO getPackageDetail(Long id);
+    PpPackageVO getPackageDetail(Long id, Long shopId);
 
     PpPackageVO convertPackageToVo(PpPackage ppPackage);
 
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageServiceImpl.java
index 6c8c094d2..2f528de45 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageServiceImpl.java
@@ -203,17 +203,18 @@ public class PpPackageServiceImpl extends ServiceImpl<PpPackageMapper, PpPackage
     }
 
     @Override
-    public PpPackageVO getPackageDetail(Long id) {
+    public PpPackageVO getPackageDetail(Long id, Long shopId) {
         PpPackage ppPackage = getPackageById(id);
 
         PpPackageVO packageVO = convertPackageToVo(ppPackage);
 
-        ShopInfo shopInfo = shopInfoService.getById(ppPackage.getShopId());
+        ShopInfo shopInfo = shopInfoService.getById(shopId);
         if (shopInfo != null) {
             packageVO.setShopName(shopInfo.getShopName());
             packageVO.setShopAddress(shopInfo.getAddress());
             packageVO.setShopLogo(shopInfo.getLogo());
         }
+        packageVO.setShopId(shopId);
         return packageVO;
     }