From eb0a98a3bc62d94ac94bf457afa165e56474ef32 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 03 十二月 2024 18:06:09 +0800
Subject: [PATCH] 修改启动异常
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java | 88 ++++++++++++++++++++++++++++++--------------
1 files changed, 60 insertions(+), 28 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..d93d7bb 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
@@ -18,6 +18,20 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.other.service.TechnicianService;
+import com.ruoyi.other.vo.TechnicianDetailVO;
+import com.ruoyi.other.vo.TechnicianVO;
+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 javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -65,37 +79,55 @@
return R.ok(page);
}
- @PostMapping("/shop/detail")
- @ApiOperation(value = "获取门店的技师详情", tags = {"小程序-门店详情-技师预约"})
- public R<Technician> shopdetail(@RequestParam Integer techId){
- //查出技师列表
- Technician technician = technicianService.getById(techId);
+ @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();
+ //查出技师订单
+ 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();
- }
+ //算出平均分并保留一位小数
+ 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<List<TechnicianVO>> technicianListByShopId(@ApiParam("门店id") @RequestParam Long shopId) {
+ return R.ok(technicianService.getTechnicianListByShopId(shopId));
+ }
+
+ /**
+ * 技师详情
+ */
+ @GetMapping("/technicianDetail")
+ @ApiOperation(value = "技师详情", tags = {"技师详情-小程序"})
+ public R<TechnicianDetailVO> technicianDetail(@ApiParam("技师id") @RequestParam Long technicianId) {
+ return R.ok(technicianService.technicianDetail(technicianId));
+ }
}
--
Gitblit v1.7.1