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

Compare commits

merge into: czg_team:master
Branches Tags
czg_team:master
czg_team:test
czg_team:dev
czg_team:backup-250910
czg_team:prod
...
pull from: czg_team:backup-250910
Branches Tags
czg_team:test
czg_team:dev
czg_team:backup-250910
czg_team:prod
czg_team:master

14 Commits
master ... backup-250

Author SHA1 Message Date
张松 3f252fa669 交班报错修复 2025-09-01 15:57:39 +08:00
张松 f1f4256fc9 测试 2025-09-01 15:45:30 +08:00
张松 328a59f6b4 测试 2025-09-01 14:49:56 +08:00
张松 6e5a0df70b Merge remote-tracking branch 'origin/master' into prod 2025-09-01 11:40:37 +08:00
wangw a5b791f007 Merge branch 'master' into prod 2025-07-01 10:39:27 +08:00
wangw 83cc406ec0 Merge branch 'master' into prod 2025-04-23 16:27:36 +08:00
wangw 956c5d2b2a Merge branch 'master' into prod 2025-04-21 14:45:27 +08:00
wangw 37e384b491 Merge branch 'master' into prod 2025-04-21 14:35:38 +08:00
wangw 240b54467d 表字段问题 2025-04-21 09:52:58 +08:00
wangw 25c6b49733 Merge branch 'master' into prod 
# Conflicts:
#	cash-api/product-server/src/main/java/com/czg/controller/user/UProductController.java
#	cash-service/product-service/src/main/java/com/czg/service/product/service/impl/UProductServiceImpl.java
 2025-04-21 09:32:09 +08:00
Tankaikai df11252cd0 刷新可售时间 2025-04-18 18:04:05 +08:00
Tankaikai bfbcb7301a 刷新可售时间 2025-04-18 17:57:47 +08:00
Tankaikai cde4185dea 刷新可售时间 2025-04-15 16:57:45 +08:00
Tankaikai b3f378f528 刷新可售时间 2025-04-15 16:47:39 +08:00
1 changed files with 3 additions and 4 deletions
Show Stats Expand all files Collapse all files

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

@ -167,20 +167,19 @@ public class AuthorizationServiceImpl implements AuthorizationService {
roleNames.add("分店商户");
List<String> headShopPromissionList = sysMenuMapper.selectByRoleId(2L).stream().map(SysMenu::getPermission).filter(StrUtil::isNotBlank).toList();
List<String> branchShopPromissionList = sysMenuMapper.selectByRoleId(3L).stream().map(SysMenu::getPermission).filter(StrUtil::isNotBlank).toList();
promissionList.removeAll(headShopPromissionList);
// promissionList.removeAll(headShopPromissionList);
promissionList.addAll(branchShopPromissionList);
}
StpKit.USER.addRoleList(roleNames);
StpKit.USER.addPermissionList(promissionList);
String platformType = ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType");
if (PlatformTypeEnum.PC_CLIENT.getValue().equals(platformType)) {
if (PlatformTypeEnum.PC_CLIENT.getValue().equals(platType)) {
// 初始化交班记录
HandoverRecord entity = getHandoverRecord(isStaff, shopInfo, shopStaff);
handoverRecordService.initHandoverRecord(entity);
}
redisService.del(RedisCst.LOGIN_CODE + loginDTO.uuid());
return new LoginVO(StpKit.USER.getTokenInfo(), new ArrayList<>(), loginDTO.loginType(), shopInfo, shopStaff);
return new LoginVO(StpKit.USER.getTokenInfo(), promissionList, loginDTO.loginType(), shopInfo, shopStaff);
}
@Override