From 143eab92440db842984c70b2045e8ba9ca9f7c21 Mon Sep 17 00:00:00 2001
From: gong <1157756119@qq.com>
Date: Sat, 20 Dec 2025 17:50:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=98=AF=E4=BF=AE=E6=94=B9=E5=BA=97=E9=93=BA=20Id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/controller/admin/DistributionController.java   | 7 +------
 .../com/czg/controller/user/UDistributionController.java   | 3 ---
 .../market/service/impl/PpPackageOrderServiceImpl.java     | 1 +
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java
index 3ab8d27d7..a0d77f7e8 100644
--- a/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java
+++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java
@@ -3,16 +3,13 @@ package com.czg.controller.admin;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.czg.annotation.SaAdminCheckPermission;
-import com.czg.annotation.SaCheckMainShop;
 import com.czg.market.dto.MkDistributionConfigDTO;
 import com.czg.market.service.*;
-import com.czg.market.vo.*;
+import com.czg.market.vo.MkDistributionConfigVO;
 import com.czg.order.dto.MkDistributionPayDTO;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
-import com.czg.service.market.service.impl.AppWxServiceImpl;
 import com.czg.utils.AssertUtil;
-import com.mybatisflex.core.paginate.Page;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -38,8 +35,6 @@ public class DistributionController {
     private MkDistributionFlowService distributionFlowService;
     @Resource
     private MkDistributionWithdrawFlowService withdrawFlowService;
-    @Resource
-    private AppWxServiceImpl appWxService;
 
     /**
      * 配置信息详情
diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java
index 469438350..e24682984 100644
--- a/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java
+++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java
@@ -13,7 +13,6 @@ import com.czg.market.vo.InviteUserVO;
 import com.czg.market.vo.MkDistributionConfigVO;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
-import com.czg.service.market.service.impl.AppWxServiceImpl;
 import com.czg.utils.AssertUtil;
 import com.mybatisflex.core.paginate.Page;
 import jakarta.annotation.Resource;
@@ -35,8 +34,6 @@ public class UDistributionController {
     @Resource
     private MkDistributionUserService distributionUserService;
     @Resource
-    private AppWxServiceImpl appWxService;
-    @Resource
     private MkDistributionWithdrawFlowService withdrawFlowService;
     @Resource
     private MkDistributionFlowService distributionFlowService;
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 42ee2d561..c6e98f9fc 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
@@ -108,6 +108,7 @@ public class PpPackageOrderServiceImpl extends ServiceImpl<PpPackageOrderMapper,
         }
 
         PpPackage aPackage = ppPackageService.getById(order.getPackageId());
+        aPackage.setShopId(order.getShopId());
         orderDto.setPackageInfo(ppPackageService.convertPackageToVo(aPackage));
 
         return orderDto;