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

bug修复

Browse Source
This commit is contained in:
张松
2025-09-29 18:45:19 +08:00
parent 6b15b624e3
commit d69b115aa0
3 changed files with 5 additions and 5 deletions
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.getHeadShopIdBySession())); return CzgResult.success(memberConfigService.detail(StpKit.USER.getHeadId()));
} }
/** /**
@@ -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.getShopId())); return CzgResult.success(memberConfigService.listLevel(StpKit.USER.getHeadShopIdBySession()));
} }

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.getShopId())); return CzgResult.success(shopRechargeService.detail(StpKit.USER.getHeadShopIdBySession()));
} }
/** /**

4
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java
View File

@@ -148,8 +148,8 @@ public class AuthorizationServiceImpl implements AuthorizationService {
if (!isAllowAccountLogin) { if (!isAllowAccountLogin) {
throw new ApiNotPrintException("当前分店账号被禁止登录"); throw new ApiNotPrintException("当前分店账号被禁止登录");
} }
StpKit.USER.login(user.getId(), user.getAccount(), shopInfo.getId(), shopInfo.getMainId(), shopInfo.getShopName(), StpKit.USER.login(user.getId(), user.getAccount(), shopInfo.getId(), shopInfo.getIsHeadShop() == 1 ? shopInfo.getId() : shopInfo.getMainId(), shopInfo.getShopName(),
isStaff ? MyStpLogic.LoginType.STAFF : MyStpLogic.LoginType.MANAGER, user.getIsAdmin(), platType, shopInfo.getMainId() == null); isStaff ? MyStpLogic.LoginType.STAFF : MyStpLogic.LoginType.MANAGER, user.getIsAdmin(), platType, shopInfo.getIsHeadShop() == 1);
// 查询角色 // 查询角色
List<SysRole> roleList = sysRoleService.getByUserId(user.getId()); List<SysRole> roleList = sysRoleService.getByUserId(user.getId());
List<String> roleNames = roleList.stream().map(SysRole::getName).collect(Collectors.toList()); List<String> roleNames = roleList.stream().map(SysRole::getName).collect(Collectors.toList());