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 fb2c5b3a1..84ec6b0b2 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 @@ -34,14 +34,16 @@ public class UPpPackageController { /** * 创建套餐推广订单 - * 参数: {"packageId": 123} + * 参数: {"packageId": 123, "shopId": 123} */ @PostMapping("/order") public CzgResult createOrder(@RequestBody JSONObject params) { AssertUtil.isNull(params, "参数不能为空"); Long packageId = params.getLong("packageId"); AssertUtil.isNull(packageId, "参数错误"); - return CzgResult.success(ppPackageOrderService.createPackageOrder(packageId)); + Long shopId = params.getLong("shopId"); + AssertUtil.isNull(shopId, "参数错误"); + return CzgResult.success(ppPackageOrderService.createPackageOrder(packageId, shopId)); } /** diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/PpPackageOrderService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/PpPackageOrderService.java index da8b3675b..1eeb316bf 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/PpPackageOrderService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/PpPackageOrderService.java @@ -19,7 +19,7 @@ public interface PpPackageOrderService extends IService { /** * 创建推广订单 */ - Long createPackageOrder(Long packageId); + Long createPackageOrder(Long packageId, Long shopId); /** * 根据订单 Id 查询推广订单详情 diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageOrderServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageOrderServiceImpl.java index ee15bce0c..42ee2d561 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageOrderServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageOrderServiceImpl.java @@ -57,7 +57,7 @@ public class PpPackageOrderServiceImpl extends ServiceImpl page = page(Page.of(reqVo.getPage(), reqVo.getSize()), queryWrapper); List voList = new ArrayList<>(); - page.getRecords().forEach(item -> voList.add(convertPackageToVo(item))); + page.getRecords().forEach(item -> { + if (!isAdmin) { + item.setShopId(shopId); + } + voList.add(convertPackageToVo(item)); + }); Page voPage = new Page<>(); BeanUtil.copyProperties(page, voPage, "records");