From e9d5d32c7ee67eec2f47ed80fe9aae92a0ce7ec1 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 10:17:38 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java | 103 +++++++++++++++++++++------------------------------
1 files changed, 42 insertions(+), 61 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 931bc30..c544de9 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;
@@ -15,12 +17,15 @@
import com.ruoyi.other.service.TechnicianService;
import com.ruoyi.other.vo.TechnicianDetailVO;
import com.ruoyi.other.vo.TechnicianVO;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Collection;
import java.util.List;
/**
@@ -41,62 +46,13 @@
private TechnicianScoreService technicianScoreService;
@Resource
private TokenService tokenService;
+ @Resource
+ private SysUserClient sysUserClient;
+ @Resource
+ private AppUserShopClient appUserShopClient;
-// @PostMapping("/shop/list")
-// @ApiOperation(value = "获取门店的技师列表", tags = {"小程序-门店详情-技师预约"})
-// public R<Page<Technician>> shoplist(@RequestParam Integer shopId,@RequestParam Integer pageNum,@RequestParam Integer pageSize){
-// //查出技师列表
-// Page<Technician> page = technicianService.lambdaQuery().eq(Technician::getShopId, shopId).eq(Technician::getStatus, 2).page(Page.of(pageNum, pageSize));
-// for (Technician technician : page.getRecords()) {
-// //查出技师订单
-// R<List<Long>> orderIdsByTechId = orderClient.getOrderIdsByTechId(technician.getId());
-// if (orderIdsByTechId.getData().isEmpty()){
-// technician.setGrade(new BigDecimal(0));
-// technician.setServeCount(0);
-// continue;
-// }
-// //查出技师评价
-// List<GoodsEvaluate> list = goodsEvaluateService.lambdaQuery().in(GoodsEvaluate::getOrderId, orderIdsByTechId.getData()).list();
-//
-// //算出平均分并保留一位小数
-// BigDecimal avg = list.stream().map(GoodsEvaluate::getGrade).reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal(list.size()), 1, BigDecimal.ROUND_HALF_UP);
-// technician.setGrade(avg);
-// technician.setServeCount(orderIdsByTechId.getData().size());
-//
-// }
-// return R.ok(page);
-// }
-// @PostMapping("/shop/detail")
-// @ApiOperation(value = "获取门店的技师详情", tags = {"小程序-门店详情-技师预约"})
-// public R<Technician> shopdetail(@RequestParam Integer techId){
-// //查出技师列表
-// Technician technician = technicianService.getById(techId);
-//
-// //查出技师订单
-// R<List<Long>> orderIdsByTechId = orderClient.getOrderIdsByTechId(technician.getId());
-// if (orderIdsByTechId.getData().isEmpty()){
-// technician.setGrade(new BigDecimal(0));
-// technician.setServeCount(0);
-// return R.ok(technician);
-// }
-// //查出技师评价
-// List<GoodsEvaluate> list = goodsEvaluateService.lambdaQuery().in(GoodsEvaluate::getOrderId, orderIdsByTechId.getData()).list();
-//
-// //算出平均分并保留一位小数
-// BigDecimal avg = list.stream().map(GoodsEvaluate::getGrade).reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal(list.size()), 1, BigDecimal.ROUND_HALF_UP);
-// technician.setGrade(avg);
-// technician.setServeCount(orderIdsByTechId.getData().size());
-// return R.ok(technician);
-// }
-// @PostMapping("/shop/tech")
-// @ApiOperation(value = "预约操作", tags = {"小程序-门店详情-技师预约"})
-// public R<Technician> shoptech(@RequestBody TechnicianSubscribe subscribe){
-// Long userId = tokenService.getLoginUserApplet().getUserid();
-// subscribe.setAppUserId(userId);
-// technicianSubscribeService.save(subscribe);
-// return R.ok();
-// }
+
/**
@@ -114,10 +70,11 @@
@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);
}
@@ -127,21 +84,33 @@
@PostMapping("/manage/addorupdate")
@ApiOperation(value = "添加编辑", tags = {"门店-技师列表"})
public R<Page<Technician>> add(@RequestBody Technician technician) {
- Integer objectId = tokenService.getLoginUser().getSysUser().getObjectId();
+
+ 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()).list();
+ 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){
+ 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());
+ 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()).list();
+ List<Technician> list = technicianService.lambdaQuery().eq(Technician::getPhone, technician.getPhone()).eq(Technician::getShopId, sysUser.getObjectId()).list();
if (!list.isEmpty()) {
return R.fail("当前号码已经添加");
}
@@ -151,7 +120,7 @@
}
}
}
- technician.setShopId(objectId);
+ technician.setShopId(sysUser.getObjectId());
R<AppUser> appUserByPhone1 = appUserClient.getAppUserByPhone1(technician.getPhone());
if (appUserByPhone1.getData()!=null){
technician.setAppUserId(appUserByPhone1.getData().getId());
@@ -219,5 +188,17 @@
technicianScoreService.save(technicianScore);
return R.ok();
}
+
+
+ /**
+ * 根据技师ids查询数据
+ * @param ids
+ * @return
+ */
+ @PostMapping("/getTechnicianByIds")
+ public R<List<Technician>> getTechnicianByIds(@RequestParam("ids") Collection<Integer> ids){
+ List<Technician> technicians = technicianService.listByIds(ids);
+ return R.ok(technicians);
+ }
}
--
Gitblit v1.7.1