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

Merge branch 'prod' into test

Browse Source
This commit is contained in:
wangw
2025-12-20 15:46:52 +08:00
parent a7306af4ee 279cdb5047
commit 79e93540c9
5 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java
View File

@@ -110,9 +110,14 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
MemberLevelConfig memberLevelConfig = memberLevelConfigService.getById(shopUser.getMemberLevelId());
if (memberLevelConfig != null) {
shopUser.setMemberName(memberLevelConfig.getName());
shopUser.setDiscount(memberLevelConfig.getDiscount());
MemberConfigVO configVO = memberConfigService.detail(memberLevelConfig.getShopId());
shopUser.setIsMemberPrice(configVO.getIsMemberPrice());
if (configVO.getIsOpen().equals(1L)) {
shopUser.setIsMemberPrice(configVO.getIsMemberPrice());
shopUser.setDiscount(memberLevelConfig.getDiscount());
}else {
shopUser.setIsMemberPrice(0);
shopUser.setDiscount(100);
}
}
}
return shopUser;

6
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java
View File

@@ -152,6 +152,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
// Step 2: 解析 apiInfo 并判断菜单是否已绑定
for (BaseMenu menu : menuList) {
if (menu.getMenuId() == 1L) {
continue;
}
// 解析 apiInfo
if (StrUtil.isNotBlank(menu.getApiInfo())) {
List<MenuApiInfoItemDTO> itemDTOS = JSONArray.parseArray(menu.getApiInfo())
@@ -177,6 +180,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
List<SysMenu> matchedMenus = sysMenuService.list(wrapper);
for (SysMenu matched : matchedMenus) {
if (matched.getMenuId() == 1L) {
continue;
}
long count = sysRolesMenusService.count(new QueryWrapper()
.eq("menu_id", matched.getMenuId())
.eq("role_id", roleId)