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 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> 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 listLevel(Long shopId) { + shopId = shopInfoService.getMainIdByShopId(shopId); ArrayList memberLevelVOS = new ArrayList<>(); levelConfigService.list(new QueryWrapper().eq(MemberLevelConfig::getShopId, shopId)).forEach(item -> { MemberLevelVO memberLevelVO = BeanUtil.copyProperties(item, MemberLevelVO.class, "cycleRewardCouponList");