From 7acdb59f8d76fc7ca22a087c9adb7881a3ae4675 Mon Sep 17 00:00:00 2001 From: phpcjl <phpcjl@gmail.com> Date: 星期三, 11 十二月 2024 14:50:41 +0800 Subject: [PATCH] 1.后台管理-商品管理 --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java | 7 +++---- 1 files changed, 3 insertions(+), 4 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..a17ee84 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(); } @@ -103,7 +103,6 @@ @ApiParam(hidden = true) Page<TechnicianSubscribe> page) { return R.ok(technicianSubscribeService.getTechnicianSubscribeByUser(page, SecurityUtils.getUserId(), status)); } - } -- Gitblit v1.7.1