From e88b02c55145624e6b8ef8f4cbd56d22b9bdfff9 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 20:00:36 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java | 82 ++++++++++++++++++++++++++++++-----------
1 files changed, 60 insertions(+), 22 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 fb1ef6c..b9745bc 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
@@ -3,19 +3,25 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.PageInfo;
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;
import com.ruoyi.other.vo.TechnicianSubscribeVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
+import io.swagger.annotations.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Arrays;
import java.util.List;
/**
@@ -26,33 +32,52 @@
* @author luodangjia
* @since 2024-11-20
*/
-@Api(tags = "技师预约管理")
+@Api("技师预约管理")
@RestController
@RequestMapping("/technician-subscribe")
public class TechnicianSubscribeController extends BaseController {
@Resource
private TechnicianSubscribeService technicianSubscribeService;
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private SysUserClient sysUserClient;
+
+
+
+
+
+
+ @GetMapping("/shop/list")
+ @ApiOperation(value = "预约列表", tags = {"门店-预约列表"})
+ public R<PageInfo<TechnicianSubscribeVO>> shoplist(@ApiParam(value = "状态") Integer status,
+ @ApiParam("电话")String phone,
+ @ApiParam("姓名")String name,
+ @ApiParam("服务方式：1=上门服务，2=到店服务")Integer serviceMode, Integer pageCurr, Integer pageSize) {
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser = sysUserClient.getSysUser(userid).getData();
+ PageInfo<TechnicianSubscribeVO> pageInfo = technicianSubscribeService.getTechnicianSubscribeByUserAndShop1(Long.valueOf(sysUser.getObjectId()), status, phone, name, serviceMode, pageCurr, pageSize);
+ return R.ok(pageInfo);
+ }
/**
* 预约列表
*/
@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);
+ public R<PageInfo<TechnicianSubscribeVO>> list(@ApiParam(value = "状态") Integer status,
+ @ApiParam(value = "门店id") @RequestParam Long shopId, Integer current, Integer size) {
+ PageInfo<TechnicianSubscribeVO> pageInfo = technicianSubscribeService.getTechnicianSubscribeByUserAndShop(shopId, status, current, size);
+ return R.ok(pageInfo);
}
/**
* 预约技师
*/
@PostMapping("/subscribe")
- @ApiOperation(value = "预约技师", notes = "预约技师", tags = {"小程序-个人中心-门店管理-预约列表-预约技师"})
+ @ApiOperation(value = "预约技师", notes = "预约技师", tags = {"小程序-个人中心-门店管理-预约列表"})
public R<Void> subscribe(@RequestBody TechnicianSubscribe technicianSubscribe) {
- technicianSubscribeService.subscribe(technicianSubscribe, technicianSubscribe.getTechnicianId());
+ technicianSubscribeService.subscribe(technicianSubscribe);
return R.ok();
}
@@ -60,9 +85,8 @@
* 取消服务
*/
@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>()
.eq(TechnicianSubscribe::getId, id)
.eq(TechnicianSubscribe::getStatus, 0));
@@ -75,12 +99,12 @@
}
/**
- * 跟新技师预约状态
+ * 更新技师预约状态
*
* @param status
*/
@PutMapping("/updateStatus")
- @ApiOperation(value = "跟新技师预约状态", notes = "跟新技师预约状态", tags = {"后台-技师预约管理-跟新技师预约状态"})
+ @ApiOperation(value = "更新技师预约状态", notes = "更新技师预约状态", tags = {"后台-技师预约管理-更新技师预约状态"})
public R<Void> updateStatus(@ApiParam @RequestParam Integer status, @ApiParam @RequestParam Long subscribeId) {
boolean update = technicianSubscribeService.update(new LambdaUpdateWrapper<TechnicianSubscribe>()
.eq(TechnicianSubscribe::getId, subscribeId)
@@ -93,14 +117,28 @@
@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);
+ @ApiOperation(value = "列表", notes = "获取用户预约列表", tags = {"小程序-个人中心-我的预约"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "status", value = "状态 0=待服务，1=已服务，2=已取消, 4=已到期", required = true, dataType = "Integer", paramType = "query"),
+ @ApiImplicitParam(name = "current", value = "当前页码，从1开始", required = true, dataType = "Integer", paramType = "query"),
+ @ApiImplicitParam(name = "size", value = "每页显示数量，默认10", dataType = "Integer", paramType = "query")
+ })
+ public R<IPage<TechnicianSubscribeVO>> homelist(@RequestParam(value = "status", required = false) @ApiParam(value = "状态 0=待服务，1=已服务，2=已取消 4 已到期") Integer status,
+ @ApiParam(hidden = true) Page<TechnicianSubscribe> page) {
+ return R.ok(technicianSubscribeService.getTechnicianSubscribeByUser(page, SecurityUtils.getUserId(), status));
}
+ /**
+ * 获取订单的预约服务列表
+ * @param orderId
+ * @return
+ */
+ @PostMapping("/getTechnicianSubscribeList")
+ public R<List<TechnicianSubscribe>> getTechnicianSubscribeList(@RequestParam("orderId") Long orderId){
+ List<TechnicianSubscribe> list = technicianSubscribeService.list(new LambdaQueryWrapper<TechnicianSubscribe>().eq(TechnicianSubscribe::getOrderId, orderId)
+ .eq(TechnicianSubscribe::getDelFlag, 0).in(TechnicianSubscribe::getStatus, Arrays.asList(0, 1)));
+ return R.ok(list);
+ }
}
--
Gitblit v1.7.1