添加缺失字段

cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java

@@ -57,8 +57,7 @@ public class UPpPackageController {
      */
     @GetMapping("/detail/{id}")
     public CzgResult<PpPackageVO> getPackageDetail(@PathVariable Long id) {
-        PpPackage aPackage = ppPackageService.getPackageById(id);
+        return CzgResult.success(ppPackageService.getPackageDetail(id));
-        return CzgResult.success(ppPackageService.convertPackageToVo(aPackage));
     }
 
     /**

cash-common/cash-common-service/src/main/java/com/czg/market/service/PpPackageService.java

@@ -48,5 +48,8 @@ public interface PpPackageService extends IService<PpPackage> {
 
     PpPackage getPackageById(Long id);
 
+    PpPackageVO getPackageDetail(Long id);
+
     PpPackageVO convertPackageToVo(PpPackage ppPackage);
+
 }

cash-common/cash-common-service/src/main/java/com/czg/market/vo/PpPackageVO.java

@@ -182,4 +182,19 @@ public class PpPackageVO {
      * 已售数量
      */
     private Integer saleNum;
+
+    /**
+     * 店铺名称
+     */
+    private String shopName;
+
+    /**
+     * 店铺logo
+     */
+    private String shopLogo;
+
+    /**
+     * 店铺地址
+     */
+    private String shopAddress;
 }

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageServiceImpl.java

@@ -3,6 +3,7 @@ package com.czg.service.market.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson2.JSONArray;
 import com.czg.account.entity.ShopConfig;
+import com.czg.account.entity.ShopInfo;
 import com.czg.account.service.ShopConfigService;
 import com.czg.account.service.ShopInfoService;
 import com.czg.constants.PpPackageConstants;
@@ -196,6 +197,21 @@ public class PpPackageServiceImpl extends ServiceImpl<PpPackageMapper, PpPackage
         return ppPackage;
     }
 
+    @Override
+    public PpPackageVO getPackageDetail(Long id) {
+        PpPackage ppPackage = getPackageById(id);
+
+        PpPackageVO packageVO = convertPackageToVo(ppPackage);
+
+        ShopInfo shopInfo = shopInfoService.getById(ppPackage.getShopId());
+        if (shopInfo != null) {
+            packageVO.setShopName(shopInfo.getShopName());
+            packageVO.setShopAddress(shopInfo.getAddress());
+            packageVO.setShopLogo(shopInfo.getLogo());
+        }
+        return null;
+    }
+
     @Override
     public PpPackageVO convertPackageToVo(PpPackage ppPackage) {
         PpPackageVO packageVO = new PpPackageVO();