From d37ac1b495dd070e37209527bbedc1ce0730951a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 01 一月 2025 15:16:41 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 3 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 f35126a..cda2f44 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
@@ -2,10 +2,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.Technician;
import com.ruoyi.other.api.domain.TechnicianScore;
import com.ruoyi.other.service.TechnicianScoreService;
import com.ruoyi.other.service.TechnicianService;
@@ -28,7 +30,7 @@
*/
@RestController
@RequestMapping("/technician")
-@Api(tags = "技师")
+@Api("技师")
public class TechnicianController extends BaseController {
@Resource
private TechnicianService technicianService;
@@ -99,9 +101,61 @@
*/
@GetMapping("/technicianListByShopId")
@ApiOperation(value = "技师列表", tags = {"技师列表-小程序"})
- public R<TableDataInfo<TechnicianVO>> technicianListByShopId(@ApiParam("门店id") @RequestParam Long shopId) {
+ public R<TableDataInfo<TechnicianVO>> technicianListByShopId(@ApiParam("门店id") @RequestParam Long shopId,@ApiParam("技师姓名") String name) {
startPage();
- return R.ok(getDataTable(technicianService.getTechnicianListByShopId(shopId)));
+ return R.ok(getDataTable(technicianService.getTechnicianListByShopId(shopId,name)));
+ }
+
+ @GetMapping("/manage/list")
+ @ApiOperation(value = "技师列表", tags = {"门店-技师列表"})
+ public R<Page<Technician>> managelist(@RequestParam Integer pageNum,@RequestParam Integer pageSize,@ApiParam("技师姓名") String name,@ApiParam("技师电话") String phone) {
+ Integer objectId = tokenService.getLoginUser().getSysUser().getObjectId();
+ Page<Technician> page = technicianService.lambdaQuery().like(name != null, Technician::getName, name)
+ .like(phone != null, Technician::getPhone, phone)
+ .eq(Technician::getShopId, objectId)
+ .page(Page.of(pageNum, pageSize));
+ return R.ok(page);
+ }
+ @PostMapping("/manage/addorupdate")
+ @ApiOperation(value = "添加编辑", tags = {"门店-技师列表"})
+ public R<Page<Technician>> add(@RequestBody Technician technician) {
+ Integer objectId = tokenService.getLoginUser().getSysUser().getObjectId();
+ technician.setShopId(objectId);
+ technicianService.saveOrUpdate(technician);
+ return R.ok();
+ }
+ @GetMapping("/manage/delete")
+ @ApiOperation(value = "删除", tags = {"门店-技师列表"})
+ public R<Page<Technician>> delete(@RequestParam Integer id) {
+ technicianService.removeById(id);
+ return R.ok();
+ }
+ @GetMapping("/manage/changeStatus")
+ @ApiOperation(value = "上下架", tags = {"门店-技师列表"})
+ public R<Page<Technician>> changeStatus(@RequestParam Integer id,@RequestParam@ApiParam("状态（1=下架，2=上架）") Integer status) {
+ Technician byId = technicianService.getById(id);
+ byId.setStatus(status);
+ technicianService.updateById(byId);
+ return R.ok();
+ }
+ @GetMapping("/manage/changesubscri")
+ @ApiOperation(value = "修改预约状态", tags = {"门店-技师列表"})
+ public R<Page<Technician>> changesubscri(@RequestParam Integer id,@RequestParam@ApiParam("预约状态（1=可预约，2=不可预约）") Integer subscribeStatus) {
+ Technician byId = technicianService.getById(id);
+ byId.setSubscribeStatus(subscribeStatus);
+ technicianService.updateById(byId);
+ return R.ok();
+ }
+
+
+
+
+
+ @GetMapping("/getById")
+ @ApiOperation(value = "技师详情", tags = {"技师详情-小程序","门店-技师列表"})
+ public R<Technician> getById(@RequestParam("id") Integer id){
+ Technician byId = technicianService.getById(id);
+ return R.ok(byId);
}
/**
--
Gitblit v1.7.1