From 7dc620a3d9f6961749d22cf731e814cb6ef67c21 Mon Sep 17 00:00:00 2001
From: gong <1157756119@qq.com>
Date: Fri, 19 Dec 2025 17:58:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=BA=97=E5=A5=97=E9=A4=90=20Id=20?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/controller/user/UPpPackageController.java | 6 ++++--
 .../java/com/czg/market/service/PpPackageOrderService.java | 2 +-
 .../market/service/impl/PpPackageOrderServiceImpl.java     | 4 ++--
 .../service/market/service/impl/PpPackageServiceImpl.java  | 7 ++++++-
 4 files changed, 13 insertions(+), 6 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 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<Long> 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<PpPackageOrder> {
     /**
      * 创建推广订单
      */
-    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<PpPackageOrderMapper,
     private ShopInfoService shopInfoService;
 
     @Override
-    public Long createPackageOrder(Long packageId) {
+    public Long createPackageOrder(Long packageId, Long shopId) {
         PpPackage aPackage = ppPackageService.getPackageById(packageId);
         if (aPackage == null) {
             throw new CzgException("套餐不存在");
@@ -68,7 +68,7 @@ public class PpPackageOrderServiceImpl extends ServiceImpl<PpPackageOrderMapper,
         }
 
         PpPackageOrder order = new PpPackageOrder()
-                .setShopId(aPackage.getShopId())
+                .setShopId(shopId)
                 .setPackageId(packageId)
                 .setUserId(StpKit.USER.getLoginIdAsLong())
                 .setShareNum(0)
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 a5d915f49..3d053ef0a 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
@@ -179,7 +179,12 @@ public class PpPackageServiceImpl extends ServiceImpl<PpPackageMapper, PpPackage
         Page<PpPackage> page = page(Page.of(reqVo.getPage(), reqVo.getSize()), queryWrapper);
 
         List<PpPackageVO> 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<PpPackageVO> voPage = new Page<>();
         BeanUtil.copyProperties(page, voPage, "records");