From d2542a6123fa6834e01ed3af23c7ba0a02696bc6 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 29 十一月 2024 16:37:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java | 74 +++++++++++++++++++++++++++++++++++-
1 files changed, 71 insertions(+), 3 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..9b6010f 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,21 @@
package com.ruoyi.other.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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.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.*;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -12,9 +25,64 @@
* @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);
+ }
+
+ /**
+ * 预约技师
+ */
+ @PostMapping("/subscribe")
+ @ApiOperation(value = "预约技师", notes = "预约技师", tags = {"小程序-个人中心-门店管理-预约列表-预约技师"})
+ public R<Void> subscribe(@RequestBody TechnicianSubscribe technicianSubscribe){
+ technicianSubscribeService.subscribe(technicianSubscribe);
+ return R.ok();
+ }
+
+ /**
+ * 取消服务
+ */
+ @GetMapping("/cancel")
+ @ApiOperation(value = "取消服务", notes = "取消服务", tags = {"小程序-个人中心-门店管理-预约列表-取消服务"})
+ public R<Void> 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 R.fail("不满足取消条件");
+ }
+ subscribe.setStatus(2);
+ technicianSubscribeService.updateById(subscribe);
+ return R.ok();
+ }
+
+
+ @GetMapping("/home/list")
+ @ApiOperation(value = "列表", notes = "列表", tags = {"小程序-个人中心-我的预约"})
+ public TableDataInfo homelist(@ApiParam(value = "状态 0=待服务，1=已服务，2=已取消 4 已到期") @RequestParam Integer status){
+ startPage();
+ List<TechnicianSubscribeVO> list = technicianSubscribeService
+ .getTechnicianSubscribeByUser(SecurityUtils.getUserId(),status);
+ return getDataTable(list);
+ }
+
}
--
Gitblit v1.7.1