From 9292f925e97bc426c7b58d022b0db9a0d2034246 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期三, 18 十二月 2024 17:03:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java | 20 +++++++++++++++++++-
1 files changed, 19 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 f683fff..6f6fe87 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
@@ -8,6 +8,7 @@
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.common.security.utils.SecurityUtils;
import com.ruoyi.other.api.domain.TechnicianSubscribe;
import com.ruoyi.other.service.TechnicianSubscribeService;
@@ -32,6 +33,23 @@
public class TechnicianSubscribeController extends BaseController {
@Resource
private TechnicianSubscribeService technicianSubscribeService;
+ @Resource
+ private TokenService tokenService;
+
+
+ @GetMapping("/shop/list")
+ @ApiOperation(value = "预约列表", tags = {"门店-预约列表"})
+ public TableDataInfo<TechnicianSubscribeVO> shoplist(@ApiParam(value = "状态") Integer status,
+ @ApiParam("电话")String phone,
+ @ApiParam("姓名")String name,
+ @ApiParam("服务方式：1=上门服务，2=到店服务")Integer serviceMode
+ ) {
+ Integer objectId = tokenService.getLoginUser().getSysUser().getObjectId();
+ startPage();
+ List<TechnicianSubscribeVO> list = technicianSubscribeService
+ .getTechnicianSubscribeByUserAndShop1(Long.valueOf(objectId),status,phone,name,serviceMode);
+ return getDataTable(list);
+ }
/**
* 预约列表
@@ -60,7 +78,7 @@
* 取消服务
*/
@GetMapping("/cancel")
- @ApiOperation(value = "取消服务", notes = "取消服务", tags = {"小程序-个人中心-门店管理,小程序-个人中心-我的预约"})
+ @ApiOperation(value = "取消服务", notes = "取消服务", tags = {"小程序-个人中心-门店管理,小程序-个人中心-我的预约","门店-预约管理"})
public R<Void> cancel(@ApiParam(value = "预约id") @RequestParam Long id) {
TechnicianSubscribe subscribe = technicianSubscribeService.getOne(new LambdaQueryWrapper<TechnicianSubscribe>()
--
Gitblit v1.7.1