From fb6eee80334ae23a2eca8c37baeef05e86c919ed Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 17:09:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java | 13 ++++++++++---
1 files changed, 10 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 fabe13d..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);
}
@@ -52,7 +52,7 @@
@PostMapping("/subscribe")
@ApiOperation(value = "预约技师", notes = "预约技师", tags = {"小程序-个人中心-门店管理-预约列表-预约技师"})
public R<Void> subscribe(@RequestBody TechnicianSubscribe technicianSubscribe) {
- technicianSubscribeService.subscribe(technicianSubscribe, technicianSubscribe.getTechnicianId());
+ technicianSubscribeService.subscribe(technicianSubscribe);
return R.ok();
}
@@ -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