From 257d66798aa538f8737980f13d94c547bf0b51ea Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 15 一月 2025 15:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 12 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 ef1e872..3691afe 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
@@ -50,7 +50,8 @@
private SysUserClient sysUserClient;
@Resource
private AppUserShopClient appUserShopClient;
-
+ @Resource
+ private AppUserClient appUserClient;
@@ -60,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);
}
@@ -75,23 +77,23 @@
Page<Technician> page = technicianService.lambdaQuery().like(name != null, Technician::getName, name)
.like(phone != null, Technician::getPhone, phone)
.eq(Technician::getShopId, sysUser.getObjectId())
+ .eq(Technician::getDelFlag, 0)
.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();
+ List<Technician> list = technicianService.lambdaQuery()
+ .eq(Technician::getPhone, technician.getPhone())
+ .eq(Technician::getShopId, sysUser.getObjectId())
+ .eq(Technician::getDelFlag, 0).list();
if (!list.isEmpty()) {
return R.fail("当前号码已经添加");
}
@@ -100,16 +102,22 @@
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())
+ .eq(Technician::getShopId, sysUser.getObjectId())
+ .ne(Technician::getId, byId.getId())
+ .eq(Technician::getDelFlag, 0).list();
if (!list.isEmpty()) {
return R.fail("当前号码已经添加");
}
@@ -127,12 +135,35 @@
technicianService.saveOrUpdate(technician);
return R.ok();
}
+
+
+
+
@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();
}
+
+
+
+
+
@GetMapping("/manage/changeStatus")
@ApiOperation(value = "上下架", tags = {"门店-技师列表"})
public R<Page<Technician>> changeStatus(@RequestParam Integer id,@RequestParam@ApiParam("状态（1=下架，2=上架）") Integer status) {
@@ -141,6 +172,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