From d9bcc1f955e1cddc6a38e55f769205a9330d3c89 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 17:06:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 44975f1..85e0ecf 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
@@ -38,11 +38,11 @@
*/
@GetMapping("/list")
@ApiOperation(value = "预约列表", notes = "预约列表", tags = {"小程序-个人中心-门店管理-预约列表"})
- public TableDataInfo<TechnicianSubscribeVO> list(@ApiParam(value = "状态") @RequestParam Integer status,
+ public TableDataInfo<TechnicianSubscribeVO> list(@ApiParam(value = "状态") Integer status,
@ApiParam(value = "门店id") @RequestParam Long shopId) {
startPage();
List<TechnicianSubscribeVO> list = technicianSubscribeService
- .getTechnicianSubscribeByUserAndShop(SecurityUtils.getUserId(), shopId);
+ .getTechnicianSubscribeByUserAndShop(shopId,status);
return getDataTable(list);
}
@@ -104,6 +104,13 @@
return R.ok(technicianSubscribeService.getTechnicianSubscribeByUser(page, SecurityUtils.getUserId(), status));
}
+ @GetMapping("/getSubscribeByOrderId")
+ @ApiOperation(value = "根据订单id获取预约信息", notes = "根据订单id获取预约信息", tags = {"后台-技师预约管理-根据订单id获取预约信息"})
+ public R<TechnicianSubscribe> getSubscribeByOrderId(@ApiParam(value = "订单id") @RequestParam Long orderId) {
+ return R.ok(technicianSubscribeService.getOne(new LambdaQueryWrapper<TechnicianSubscribe>()
+ .eq(TechnicianSubscribe::getOrderId, orderId)));
+ }
+
}
--
Gitblit v1.7.1