From 60e22397096522ae48bc3af1f756c705f94d2d27 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 16:40:52 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java | 39 +++++++++++++++++++++++----------------
1 files changed, 23 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 32aafb7..68e1cff 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
@@ -84,11 +84,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,18 +106,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())
- .ne(Technician::getId, byId.getId()).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());
@@ -138,7 +131,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