From e004a4b07175df1257c157355cbfc4d5f560116a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 11:31:52 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java | 63 +++++++++++++++++++++----------
1 files changed, 43 insertions(+), 20 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 64f1a8b..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,24 +1,23 @@
package com.ruoyi.other.controller;
+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.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.ApiOperation;
-
-import javax.annotation.Resource;
-import java.util.List;
-
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.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;
/**
* <p>
@@ -30,17 +29,15 @@
*/
@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){
@@ -103,8 +100,16 @@
*/
@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) {
+ 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);
}
/**
@@ -115,5 +120,23 @@
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();
+ }
}
--
Gitblit v1.7.1