From 98accdd9c6dd5c20d0b565e4f6ddd382c63b6308 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 16:54:58 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 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 bab4935..32aafb7 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,7 +48,10 @@
private TokenService tokenService;
@Resource
private SysUserClient sysUserClient;
-
+ @Resource
+ private AppUserShopClient appUserShopClient;
+ @Resource
+ private AppUserClient appUserClient;
@@ -66,21 +71,24 @@
@GetMapping("/manage/list")
@ApiOperation(value = "技师列表", tags = {"门店-技师列表"})
public R<Page<Technician>> managelist(@RequestParam Integer pageNum,@RequestParam Integer pageSize,@ApiParam("技师姓名") String name,@ApiParam("技师电话") String phone) {
- Integer objectId = tokenService.getLoginUser().getSysUser().getObjectId();
+ Long userid = tokenService.getLoginUser().getSysUser().getUserId();
+ SysUser sysUser = sysUserClient.getSysUser(userid).getData();
Page<Technician> page = technicianService.lambdaQuery().like(name != null, Technician::getName, name)
.like(phone != null, Technician::getPhone, phone)
- .eq(Technician::getShopId, objectId)
+ .eq(Technician::getShopId, sysUser.getObjectId())
.page(Page.of(pageNum, pageSize));
return R.ok(page);
}
- @Resource
- private AppUserClient appUserClient;
+
@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,13 +96,24 @@
return R.fail("当前号码已经添加");
}
R<AppUser> appUserByPhone1 = appUserClient.getAppUserByPhone1(technician.getPhone());
- if (appUserByPhone1.getData()==null){
+ AppUser appUser = appUserByPhone1.getData();
+ if (appUser ==null){
return R.fail("当前号码暂无注册用户");
}
+ appUser.setUserType(2);
+ appUserClient.editAppUserById(appUser);
+ AppUserShop appUserShop = new AppUserShop();
+ appUserShop.setShopId(sysUser.getObjectId());
+ appUserShop.setAppUserId(appUser.getId());
+ appUserShop.setRoleType(3);
+ 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();
+ List<Technician> list = technicianService.lambdaQuery()
+ .eq(Technician::getPhone, technician.getPhone())
+ .ne(Technician::getId, byId.getId()).list();
if (!list.isEmpty()) {
return R.fail("当前号码已经添加");
}
@@ -112,12 +131,21 @@
technicianService.saveOrUpdate(technician);
return R.ok();
}
+
+
+
+
@GetMapping("/manage/delete")
@ApiOperation(value = "删除", tags = {"门店-技师列表"})
public R<Page<Technician>> delete(@RequestParam Integer id) {
technicianService.removeById(id);
return R.ok();
}
+
+
+
+
+
@GetMapping("/manage/changeStatus")
@ApiOperation(value = "上下架", tags = {"门店-技师列表"})
public R<Page<Technician>> changeStatus(@RequestParam Integer id,@RequestParam@ApiParam("状态（1=下架，2=上架）") Integer status) {
@@ -126,6 +154,10 @@
technicianService.updateById(byId);
return R.ok();
}
+
+
+
+
@GetMapping("/manage/changesubscri")
@ApiOperation(value = "修改预约状态", tags = {"门店-技师列表"})
public R<Page<Technician>> changesubscri(@RequestParam Integer id,@RequestParam@ApiParam("预约状态（1=可预约，2=不可预约）") Integer subscribeStatus) {
--
Gitblit v1.7.1