czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

分点查看主店信息

This commit is contained in:
张松 2025-09-29 19:09:49 +08:00
parent 0ce330ef5d
commit 6e3980cf8f
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cash-api/market-server/src/main/java/com/czg/controller/admin/MemberController.java
View File

@ -39,7 +39,7 @@ public class MemberController {
// @SaAdminCheckPermission(value = "member:detail", name = "会员配置列表") // @SaAdminCheckPermission(value = "member:detail", name = "会员配置列表")
@GetMapping @GetMapping
public CzgResult<MemberConfigVO> detail() { 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 = "会员配置列表") // @SaAdminCheckPermission(value = "member:edit", name = "会员配置列表")
@GetMapping("/level/list") @GetMapping("/level/list")
public CzgResult<ArrayList<MemberLevelVO>> levelList() { public CzgResult<ArrayList<MemberLevelVO>> levelList() {
return CzgResult.success(memberConfigService.listLevel(StpKit.USER.getHeadShopIdBySession())); return CzgResult.success(memberConfigService.listLevel(StpKit.USER.getShopId()));
} }

2
cash-api/market-server/src/main/java/com/czg/controller/admin/ShopRechargeController.java
View File

@ -46,7 +46,7 @@ public class ShopRechargeController {
if (!StpKit.USER.isManager()) { if (!StpKit.USER.isManager()) {
return CzgResult.failure("无权限操作"); return CzgResult.failure("无权限操作");
} }
return CzgResult.success(shopRechargeService.detail(StpKit.USER.getMainShopId())); return CzgResult.success(shopRechargeService.detail(StpKit.USER.getShopId()));
} }
/** /**

1
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java
View File

@ -73,6 +73,7 @@ public class MkShopRechargeServiceImpl extends ServiceImpl<MkShopRechargeMapper,
@Override @Override
public MkShopRechargeVO detail(Long shopId) { public MkShopRechargeVO detail(Long shopId) {
shopId = shopInfoService.getMainIdByShopId(shopId);
ShopInfo shopInfo = shopInfoService.getById(shopId); ShopInfo shopInfo = shopInfoService.getById(shopId);
if (shopInfo.getMainId() != null) { if (shopInfo.getMainId() != null) {
shopId = shopInfo.getMainId(); shopId = shopInfo.getMainId();

2
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
View File

@ -72,6 +72,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
@Override @Override
public MemberConfigVO detail(Long shopId) { public MemberConfigVO detail(Long shopId) {
shopId = shopInfoService.getMainIdByShopId(shopId);
TbMemberConfig memberConfig = getOne(new QueryWrapper().eq(TbMemberConfig::getShopId, shopId)); TbMemberConfig memberConfig = getOne(new QueryWrapper().eq(TbMemberConfig::getShopId, shopId));
if (memberConfig == null) { if (memberConfig == null) {
memberConfig = new TbMemberConfig(); memberConfig = new TbMemberConfig();
@ -260,6 +261,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
@Override @Override
public ArrayList<MemberLevelVO> listLevel(Long shopId) { public ArrayList<MemberLevelVO> listLevel(Long shopId) {
shopId = shopInfoService.getMainIdByShopId(shopId);
ArrayList<MemberLevelVO> memberLevelVOS = new ArrayList<>(); ArrayList<MemberLevelVO> memberLevelVOS = new ArrayList<>();
levelConfigService.list(new QueryWrapper().eq(MemberLevelConfig::getShopId, shopId)).forEach(item -> { levelConfigService.list(new QueryWrapper().eq(MemberLevelConfig::getShopId, shopId)).forEach(item -> {
MemberLevelVO memberLevelVO = BeanUtil.copyProperties(item, MemberLevelVO.class, "cycleRewardCouponList"); MemberLevelVO memberLevelVO = BeanUtil.copyProperties(item, MemberLevelVO.class, "cycleRewardCouponList");