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 ecad4e691..fb2c5b3a1 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 @@ -57,8 +57,7 @@ public class UPpPackageController { */ @GetMapping("/detail/{id}") public CzgResult getPackageDetail(@PathVariable Long id) { - PpPackage aPackage = ppPackageService.getPackageById(id); - return CzgResult.success(ppPackageService.convertPackageToVo(aPackage)); + return CzgResult.success(ppPackageService.getPackageDetail(id)); } /** 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 6e3ded3b8..a03782f2d 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,5 +48,8 @@ public interface PpPackageService extends IService { PpPackage getPackageById(Long id); + PpPackageVO getPackageDetail(Long id); + PpPackageVO convertPackageToVo(PpPackage ppPackage); + } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/PpPackageVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/PpPackageVO.java index 12d650223..d517f0281 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/PpPackageVO.java +++ b/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; } 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 398dfd3d8..49d56215a 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 @@ -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