From a8d2cb07f6440dc54dc4005b0b06d5a47cb1517d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 16 十二月 2024 13:34:03 +0800
Subject: [PATCH] 12.16
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java | 179 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 110 insertions(+), 69 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 8a9f299..26bca8a 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,23 +1,23 @@
package com.ruoyi.other.controller;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.domain.GoodsEvaluate;
import com.ruoyi.other.api.domain.Technician;
-import com.ruoyi.other.api.domain.TechnicianSubscribe;
-import com.ruoyi.other.api.feignClient.OrderClient;
-import com.ruoyi.other.service.GoodsEvaluateService;
+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 com.ruoyi.other.vo.TechnicianDetailVO;
+import com.ruoyi.other.vo.TechnicianVO;
+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.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
/**
* <p>
@@ -29,73 +29,114 @@
*/
@RestController
@RequestMapping("/technician")
-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());
+// @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);
+// }
- }
- 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();
+// }
+
+
+ /**
+ * 指定门店技师列表
+ */
+ @GetMapping("/technicianListByShopId")
+ @ApiOperation(value = "技师列表", tags = {"技师列表-小程序"})
+ public R<TableDataInfo<TechnicianVO>> technicianListByShopId(@ApiParam("门店id") @RequestParam Long shopId,@ApiParam("技师姓名") String name) {
+ startPage();
+ return R.ok(getDataTable(technicianService.getTechnicianListByShopId(shopId,name)));
+ }
+
+ @GetMapping("/getById")
+ @ApiOperation(value = "技师详情", tags = {"技师详情-小程序"})
+ public R<Technician> getById(@RequestParam("id") Integer id){
+ Technician byId = technicianService.getById(id);
+ return R.ok(byId);
+ }
+
+ /**
+ * 技师详情
+ */
+ @GetMapping("/technicianDetail")
+ @ApiOperation(value = "技师详情", tags = {"技师详情-小程序"})
+ 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("已打过分，无法再次打分");
}
-
- @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();
- }
-
-
+ technicianScore.setAppUserId(userid);
+ technicianScoreService.save(technicianScore);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1