From bb66ef51805b58448af8edae8e6b04f153d80b5f Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期三, 04 十二月 2024 14:06:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java | 109 +++++++++++++++++++++++++++---------------------------
1 files changed, 54 insertions(+), 55 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 d93d7bb..cb7a0ba 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
@@ -54,62 +54,61 @@
private TechnicianSubscribeService technicianSubscribeService;
@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();
+// @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);
+// }
- //算出平均分并保留一位小数
- 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();
- }
+// @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();
+// }
/**
--
Gitblit v1.7.1