diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelAdminInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelAdminInfoController.java index 0bd03b4..fda32ba 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelAdminInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelAdminInfoController.java @@ -121,7 +121,7 @@ public class PlayPersonnelAdminInfoController { @Log(title = "管理员管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { - Long ruleId = sysRoleService.selectByRoleKey("leader").getRoleId(); + Long ruleId = sysRoleService.selectByRoleKey("operator").getRoleId(); for (String id : ids) { // 判断数据是否存在 PlayPersonnelAdminInfoEntity entity = playPersonnelAdminInfoService.selectPlayPersonnelAdminInfoById(id); diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelWaiterInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelWaiterInfoController.java index e7496e0..8f70011 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelWaiterInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelWaiterInfoController.java @@ -114,7 +114,7 @@ public class PlayPersonnelWaiterInfoController { @Log(title = "客服信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { - Long ruleId = sysRoleService.selectByRoleKey("leader").getRoleId(); + Long ruleId = sysRoleService.selectByRoleKey("operator").getRoleId(); for (String id : ids) { // 判断数据是否存在 PlayPersonnelWaiterInfoEntity entity = playClerkWaiterInfoService.selectPlayClerkWaiterInfoById(id); diff --git a/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java index a85fcb8..71e13a8 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java @@ -334,11 +334,11 @@ public class SysTenantServiceImpl extends ServiceImpl waiterMenuIdList = Arrays.asList(1100L, 1101L, 1103L, 1104L, 1105L); + List waiterMenuIdList = Arrays.asList(102, 1100, 1101, 1103, 1104, 1105); List waiterMenuList = waiterMenuIdList.stream().map(menu -> { SysRoleMenuEntity rm = new SysRoleMenuEntity(); rm.setRoleId(waiter.getRoleId()); - rm.setMenuId(menu); + rm.setMenuId(Long.valueOf(menu)); return rm; }).collect(Collectors.toList()); roleMenuService.saveBatch(waiterMenuList); @@ -353,11 +353,11 @@ public class SysTenantServiceImpl extends ServiceImpl leaderMenuIdList = Arrays.asList(1000L, 10001L, 2087L, 1100L, 1101L, 2094L); + List leaderMenuIdList = Arrays.asList(101, 102, 1000, 2095, 2096, 2097, 2087, 1001, 1100, 1101, 105, 2094); List leaderMenuList = leaderMenuIdList.stream().map(menu -> { SysRoleMenuEntity rm = new SysRoleMenuEntity(); rm.setRoleId(leader.getRoleId()); - rm.setMenuId(menu); + rm.setMenuId(Long.valueOf(menu)); return rm; }).collect(Collectors.toList()); roleMenuService.saveBatch(leaderMenuList); diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkTypeController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkTypeController.java new file mode 100644 index 0000000..f291459 --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkTypeController.java @@ -0,0 +1,42 @@ +package com.starry.admin.modules.weichat.controller; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.starry.admin.modules.clerk.module.entity.PlayClerkTypeInfoEntity; +import com.starry.admin.modules.clerk.service.IPlayClerkTypeInfoService; +import com.starry.common.result.R; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 店员等级 + * + * @author admin + * @since 2024/5/29 上午6:24 + **/ +@Slf4j +@RestController +@RequestMapping("/wx/clerk/type") +public class WxClerkTypeController { + + @Resource + private IPlayClerkTypeInfoService clerkTypeInfoService; + + + /** + * 顾客查询所有店员所有等级列表 + * + * @return 店员所有等级列表 + */ + @GetMapping("/list") + public R clerkTypeList() { + List list = clerkTypeInfoService.list(Wrappers.lambdaQuery(PlayClerkTypeInfoEntity.class).eq(PlayClerkTypeInfoEntity::getHomeDisplayed,1).orderByDesc(PlayClerkTypeInfoEntity::getSort)); + return R.ok(list); + } + + +}