From d1cab4b2f2690d1331f12f0d9de78bbbf926f390 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 14:27:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java | 269 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 193 insertions(+), 76 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 040a1d8..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
@@ -1,25 +1,32 @@
package com.ruoyi.other.controller;
+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;
import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.other.api.feignClient.OrderClient;
-import com.ruoyi.other.service.GoodsEvaluateService;
+import com.ruoyi.other.api.domain.Technician;
+import com.ruoyi.other.api.domain.TechnicianScore;
+import com.ruoyi.other.service.TechnicianScoreService;
import com.ruoyi.other.service.TechnicianService;
-import com.ruoyi.other.service.TechnicianSubscribeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-import javax.annotation.Resource;
-import java.util.List;
-
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.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
/**
* <p>
@@ -31,73 +38,22 @@
*/
@RestController
@RequestMapping("/technician")
-@Api(tags = "技师")
-public class TechnicianController {
+@Api("技师")
+public class TechnicianController extends BaseController {
@Resource
private TechnicianService technicianService;
@Resource
- private GoodsEvaluateService goodsEvaluateService;
- @Resource
- private OrderClient orderClient;
- @Resource
- private TechnicianSubscribeService technicianSubscribeService;
+ private TechnicianScoreService technicianScoreService;
@Resource
private TokenService tokenService;
-// @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);
-// }
+ @Resource
+ private SysUserClient sysUserClient;
+ @Resource
+ private AppUserShopClient appUserShopClient;
+ @Resource
+ private AppUserClient appUserClient;
-// @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();
-// }
+
/**
@@ -105,8 +61,139 @@
*/
@GetMapping("/technicianListByShopId")
@ApiOperation(value = "技师列表", tags = {"技师列表-小程序"})
- public R<List<TechnicianVO>> technicianListByShopId(@ApiParam("门店id") @RequestParam Long shopId) {
- return R.ok(technicianService.getTechnicianListByShopId(shopId));
+ 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,point);
+ TableDataInfo<TechnicianVO> dataTable = getDataTable(technicianListByShopId);
+ return R.ok(dataTable);
+ }
+
+ @GetMapping("/manage/list")
+ @ApiOperation(value = "技师列表", tags = {"门店-技师列表"})
+ public R<Page<Technician>> managelist(@RequestParam Integer pageNum,@RequestParam Integer pageSize,@ApiParam("技师姓名") String name,@ApiParam("技师电话") String phone) {
+ 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, sysUser.getObjectId())
+ .eq(Technician::getDelFlag, 0)
+ .page(Page.of(pageNum, pageSize));
+ return R.ok(page);
+ }
+
+
+ @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())
+ .eq(Technician::getDelFlag, 0).list();
+ if (!list.isEmpty()) {
+ return R.fail("当前号码已经添加");
+ }
+ R<AppUser> appUserByPhone1 = appUserClient.getAppUserByPhone1(technician.getPhone());
+ 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())
+ .ne(Technician::getId, byId.getId())
+ .eq(Technician::getDelFlag, 0).list();
+ if (!list.isEmpty()) {
+ return R.fail("当前号码已经添加");
+ }
+ R<AppUser> appUserByPhone1 = appUserClient.getAppUserByPhone1(technician.getPhone());
+ if (appUserByPhone1.getData()==null){
+ return R.fail("当前号码暂无注册用户");
+ }
+ }
+ }
+ technician.setShopId(sysUser.getObjectId());
+ R<AppUser> appUserByPhone1 = appUserClient.getAppUserByPhone1(technician.getPhone());
+ if (appUserByPhone1.getData()!=null){
+ technician.setAppUserId(appUserByPhone1.getData().getId());
+ }
+ technicianService.saveOrUpdate(technician);
+ return R.ok();
+ }
+
+
+
+
+ @GetMapping("/manage/delete")
+ @ApiOperation(value = "删除", tags = {"门店-技师列表"})
+ public R<Page<Technician>> delete(@RequestParam Integer 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) {
+ Technician byId = technicianService.getById(id);
+ byId.setStatus(status);
+ 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) {
+ Technician byId = technicianService.getById(id);
+ byId.setSubscribeStatus(subscribeStatus);
+ technicianService.updateById(byId);
+ return R.ok();
+ }
+
+
+
+
+
+ @GetMapping("/getById")
+ @ApiOperation(value = "技师详情", tags = {"技师详情-小程序","门店-技师列表"})
+ public R<Technician> getById(@RequestParam("id") Integer id){
+ Technician byId = technicianService.getById(id);
+ return R.ok(byId);
}
/**
@@ -117,5 +204,35 @@
public R<TechnicianDetailVO> technicianDetail(@ApiParam("技师id") @RequestParam Long technicianId) {
return R.ok(technicianService.technicianDetail(technicianId));
}
+
+ /**
+ * 打分
+ */
+ @PostMapping("/grade")
+ @ApiOperation(value = "打分", tags = {"打分-小程序"})
+ public R<Void> grade(@RequestBody TechnicianScore technicianScore) {
+ Long userid = tokenService.getLoginUserApplet().getUserid();
+ TechnicianScore technicianScoreServiceOne = technicianScoreService.getOne(new LambdaQueryWrapper<TechnicianScore>()
+ .eq(TechnicianScore::getAppUserId, userid)
+ .eq(TechnicianScore::getTechnicianId, technicianScore.getTechnicianId()));
+ if (technicianScoreServiceOne != null) {
+ return R.fail("已打过分，无法再次打分");
+ }
+ technicianScore.setAppUserId(userid);
+ 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