From 559ee10df3622e4802ca5664b83b713cd3a75f97 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 25 十一月 2024 11:42:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java
index 2188dc1..36b76f0 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java
@@ -1,8 +1,24 @@
package com.ruoyi.other.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.other.api.domain.TechnicianSubscribe;
+import com.ruoyi.other.service.TechnicianSubscribeService;
+import com.ruoyi.other.vo.TechnicianSubscribeVO;
+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 javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -12,9 +28,43 @@
* @author luodangjia
* @since 2024-11-20
*/
+@Api(tags = "技师预约管理")
@RestController
@RequestMapping("/technician-subscribe")
-public class TechnicianSubscribeController {
+public class TechnicianSubscribeController extends BaseController {
+ @Resource
+ private TechnicianSubscribeService technicianSubscribeService;
+
+ /**
+ * 预约列表
+ */
+ @GetMapping("/list")
+ @ApiOperation(value = "预约列表", notes = "预约列表", tags = {"小程序-个人中心-门店管理-预约列表"})
+ public TableDataInfo list(@ApiParam(value = "状态") @RequestParam Integer status,
+ @ApiParam(value = "门店id") @RequestParam Long shopId){
+ startPage();
+ List<TechnicianSubscribeVO> list = technicianSubscribeService
+ .getTechnicianSubscribeByUserAndShop(SecurityUtils.getUserId(),shopId);
+ return getDataTable(list);
+ }
+
+ /**
+ * 取消服务
+ */
+ @GetMapping("/cancel")
+ @ApiOperation(value = "取消服务", notes = "取消服务", tags = {"小程序-个人中心-门店管理-预约列表-取消服务"})
+ public AjaxResult cancel(@ApiParam(value = "预约id") @RequestParam Long id){
+
+ TechnicianSubscribe subscribe = technicianSubscribeService.getOne(new LambdaQueryWrapper<TechnicianSubscribe>()
+ .eq(TechnicianSubscribe::getId, id)
+ .eq(TechnicianSubscribe::getStatus, 0));
+ if (null == subscribe){
+ return error("不满足取消条件");
+ }
+ subscribe.setStatus(2);
+ technicianSubscribeService.updateById(subscribe);
+ return success();
+ }
}
--
Gitblit v1.7.1