From 0586a24d8a7ba5f35fb825fbd49a8363b1e5b289 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期三, 15 一月 2025 10:24:45 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java | 42 ++++++++++++++++++++++++++---------------- 1 files changed, 26 insertions(+), 16 deletions(-) diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java index fe74705..d5d560c 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java @@ -61,9 +61,10 @@ */ @GetMapping("/technicianListByShopId") @ApiOperation(value = "技师列表", tags = {"技师列表-小程序"}) - public R<TableDataInfo<TechnicianVO>> technicianListByShopId(@ApiParam("门店id") @RequestParam Long shopId,@ApiParam("技师姓名") String name) { + public R<TableDataInfo<TechnicianVO>> technicianListByShopId(@ApiParam("门店id") @RequestParam Long shopId,@ApiParam("技师姓名") String name,@ApiParam("评分") Integer point) { + //@ApiParam("评分") Integer point 1倒序 2正序 startPage(); - List<TechnicianVO> technicianListByShopId = technicianService.getTechnicianListByShopId(shopId, name); + List<TechnicianVO> technicianListByShopId = technicianService.getTechnicianListByShopId(shopId, name,point); TableDataInfo<TechnicianVO> dataTable = getDataTable(technicianListByShopId); return R.ok(dataTable); } @@ -84,11 +85,8 @@ @PostMapping("/manage/addorupdate") @ApiOperation(value = "添加编辑", tags = {"门店-技师列表"}) public R<Page<Technician>> add(@RequestBody Technician technician) { - Long userid = tokenService.getLoginUser().getUserid(); SysUser sysUser = sysUserClient.getSysUser(userid).getData(); - - if (technician.getId()==null) { technician.setSubscribeStatus(2); List<Technician> list = technicianService.lambdaQuery().eq(Technician::getPhone, technician.getPhone()).eq(Technician::getShopId, sysUser.getObjectId()).list(); @@ -109,16 +107,14 @@ appUserShopClient.saveAppUserShop(appUserShop); }else { - Technician byId = technicianService.getById(technician.getId()); - if (byId.getPhone()!=technician.getPhone()){ - List<Technician> list = technicianService.lambdaQuery().eq(Technician::getPhone, technician.getPhone()).eq(Technician::getShopId, sysUser.getObjectId()).list(); - if (!list.isEmpty()) { - return R.fail("当前号码已经添加"); - } - R<AppUser> appUserByPhone1 = appUserClient.getAppUserByPhone1(technician.getPhone()); - if (appUserByPhone1.getData()==null){ - return R.fail("当前号码暂无注册用户"); - } + List<Technician> list = technicianService.lambdaQuery().eq(Technician::getPhone, technician.getPhone()).eq(Technician::getShopId, sysUser.getObjectId()) + .ne(Technician::getId, technician.getId()).list(); + if(list.size() > 0){ + return R.fail("当前号码已经添加"); + } + R<AppUser> appUserByPhone1 = appUserClient.getAppUserByPhone1(technician.getPhone()); + if (appUserByPhone1.getData()==null){ + return R.fail("当前号码暂无注册用户"); } } technician.setShopId(sysUser.getObjectId()); @@ -136,7 +132,21 @@ @GetMapping("/manage/delete") @ApiOperation(value = "删除", tags = {"门店-技师列表"}) public R<Page<Technician>> delete(@RequestParam Integer id) { - technicianService.removeById(id); + Technician technician = technicianService.getById(id); + technician.setDelFlag(1); + technicianService.updateById(technician); + //检查删除app_user_shop数据 + AppUserShop appUserShop = new AppUserShop(); + appUserShop.setAppUserId(technician.getAppUserId()); + appUserShop.setShopId(technician.getShopId()); + appUserShop.setRoleType(3); + appUserShopClient.delAppUserShop(appUserShop); + List<AppUserShop> userShopList = appUserShopClient.getAppUserShop(technician.getAppUserId()).getData(); + if(userShopList.size() == 0){ + AppUser appUser = appUserClient.getAppUserById(technician.getAppUserId()); + appUser.setUserType(1); + appUserClient.editAppUserById(appUser); + } return R.ok(); } -- Gitblit v1.7.1