From 6e3980cf8f8e1c9ba7dfa78d01ae090c04a4e50b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Mon, 29 Sep 2025 19:09:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=82=B9=E6=9F=A5=E7=9C=8B=E4=B8=BB?=
 =?UTF-8?q?=E5=BA=97=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/czg/controller/admin/MemberController.java  | 4 ++--
 .../java/com/czg/controller/admin/ShopRechargeController.java | 2 +-
 .../market/service/impl/MkShopRechargeServiceImpl.java        | 1 +
 .../market/service/impl/TbMemberConfigServiceImpl.java        | 2 ++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/MemberController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/MemberController.java
index 4974e1de..0c82001f 100644
--- a/cash-api/market-server/src/main/java/com/czg/controller/admin/MemberController.java
+++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/MemberController.java
@@ -39,7 +39,7 @@ public class MemberController {
 //    @SaAdminCheckPermission(value = "member:detail", name = "会员配置列表")
     @GetMapping
     public CzgResult<MemberConfigVO> detail() {
-        return CzgResult.success(memberConfigService.detail(StpKit.USER.getHeadId()));
+        return CzgResult.success(memberConfigService.detail(StpKit.USER.getShopId()));
     }
 
     /**
@@ -94,7 +94,7 @@ public class MemberController {
 //    @SaAdminCheckPermission(value = "member:edit", name = "会员配置列表")
     @GetMapping("/level/list")
     public CzgResult<ArrayList<MemberLevelVO>> levelList() {
-        return CzgResult.success(memberConfigService.listLevel(StpKit.USER.getHeadShopIdBySession()));
+        return CzgResult.success(memberConfigService.listLevel(StpKit.USER.getShopId()));
     }
 
 
diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/ShopRechargeController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/ShopRechargeController.java
index b41d77e1..3b3b8384 100644
--- a/cash-api/market-server/src/main/java/com/czg/controller/admin/ShopRechargeController.java
+++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/ShopRechargeController.java
@@ -46,7 +46,7 @@ public class ShopRechargeController {
         if (!StpKit.USER.isManager()) {
             return CzgResult.failure("无权限操作");
         }
-        return CzgResult.success(shopRechargeService.detail(StpKit.USER.getMainShopId()));
+        return CzgResult.success(shopRechargeService.detail(StpKit.USER.getShopId()));
     }
 
     /**
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java
index 689e975b..bf893374 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java
@@ -73,6 +73,7 @@ public class MkShopRechargeServiceImpl extends ServiceImpl<MkShopRechargeMapper,
 
     @Override
     public MkShopRechargeVO detail(Long shopId) {
+        shopId = shopInfoService.getMainIdByShopId(shopId);
         ShopInfo shopInfo = shopInfoService.getById(shopId);
         if (shopInfo.getMainId() != null) {
             shopId = shopInfo.getMainId();
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
index 180b947f..9d94e784 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
@@ -72,6 +72,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
 
     @Override
     public MemberConfigVO detail(Long shopId) {
+        shopId = shopInfoService.getMainIdByShopId(shopId);
         TbMemberConfig memberConfig = getOne(new QueryWrapper().eq(TbMemberConfig::getShopId, shopId));
         if (memberConfig == null) {
             memberConfig = new TbMemberConfig();
@@ -260,6 +261,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
 
     @Override
     public ArrayList<MemberLevelVO> listLevel(Long shopId) {
+        shopId = shopInfoService.getMainIdByShopId(shopId);
         ArrayList<MemberLevelVO> memberLevelVOS = new ArrayList<>();
         levelConfigService.list(new QueryWrapper().eq(MemberLevelConfig::getShopId, shopId)).forEach(item -> {
             MemberLevelVO memberLevelVO = BeanUtil.copyProperties(item, MemberLevelVO.class, "cycleRewardCouponList");