From c32e57ac03e0ab46d7e2c2a675695092a6fe439c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 11 一月 2025 19:47:43 +0800
Subject: [PATCH] 1.修复bug:新增技师时未绑定AppUserPhone表
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserShopClientFallbackFactory.java | 2 ++
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java | 16 +++++++++++++++-
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserShopClient.java | 2 +-
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserShopClientFallbackFactory.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserShopClientFallbackFactory.java
index 4689397..29097d8 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserShopClientFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserShopClientFallbackFactory.java
@@ -4,6 +4,7 @@
import com.ruoyi.account.api.model.AppUserShop;
import com.ruoyi.common.core.domain.R;
import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.web.bind.annotation.PostMapping;
import java.util.List;
@@ -26,6 +27,7 @@
return R.fail("删除用户门店关系数据失败：" + cause.getMessage());
}
+ @PostMapping("/saveAppUserShop/delAppUserShop")
@Override
public void saveAppUserShop(AppUserShop appUserShop) {
R.fail("保存用户门店关系数据失败：" + cause.getMessage());
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserShopClient.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserShopClient.java
index ed3b2a1..694ef0f 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserShopClient.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserShopClient.java
@@ -36,6 +36,6 @@
* 保存关系数据
* @param appUserShop
*/
- @PostMapping("/saveAppUserShop/delAppUserShop")
+ @PostMapping("/appUserShop/saveAppUserShop")
void saveAppUserShop(@RequestBody AppUserShop appUserShop);
}
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 bab4935..cfe3d51 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
@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.feignClient.AppUserShopClient;
import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.api.model.AppUserShop;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.TableDataInfo;
@@ -46,6 +48,8 @@
private TokenService tokenService;
@Resource
private SysUserClient sysUserClient;
+ @Resource
+ private AppUserShopClient appUserShopClient;
@@ -79,8 +83,11 @@
@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();
@@ -88,9 +95,16 @@
return R.fail("当前号码已经添加");
}
R<AppUser> appUserByPhone1 = appUserClient.getAppUserByPhone1(technician.getPhone());
- if (appUserByPhone1.getData()==null){
+ AppUser appUser = appUserByPhone1.getData();
+ if (appUser ==null){
return R.fail("当前号码暂无注册用户");
}
+
+ AppUserShop appUserShop = new AppUserShop();
+ appUserShop.setShopId(sysUser.getObjectId());
+ appUserShop.setAppUserId(appUser.getId());
+ appUserShopClient.saveAppUserShop(appUserShop);
+
}else {
Technician byId = technicianService.getById(technician.getId());
if (byId.getPhone()!=technician.getPhone()){
--
Gitblit v1.7.1