From 8093bf217b5dbe59a5703b013f3fc79ed0d4fc36 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 11 一月 2025 18:06:03 +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 | 68 ++++++---------------------------
1 files changed, 13 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 237be21..bab4935 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
@@ -23,6 +23,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Collection;
import java.util.List;
/**
@@ -48,61 +49,6 @@
-// @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();
-// }
/**
@@ -226,5 +172,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