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 getPackageDetail(@PathVariable Long id) { - return CzgResult.success(ppPackageService.getPackageDetail(id)); + public CzgResult 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 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