java/qijisheng.git

			@@ -14,6 +14,8 @@
			import com.ruoyi.other.api.domain.TechnicianSubscribe;
			import com.ruoyi.other.service.TechnicianSubscribeService;
			import com.ruoyi.other.vo.TechnicianSubscribeVO;
			import com.ruoyi.system.api.domain.SysUser;
			import com.ruoyi.system.api.feignClient.SysUserClient;
			import io.swagger.annotations.*;
			import org.springframework.web.bind.annotation.*;

			@@ -36,6 +38,12 @@
			private TechnicianSubscribeService technicianSubscribeService;
			@Resource
			private TokenService tokenService;
			@Resource
			private SysUserClient sysUserClient;






			@GetMapping("/shop/list")
			@@ -44,8 +52,9 @@
			@ApiParam("电话")String phone,
			@ApiParam("姓名")String name,
			@ApiParam("服务方式：1=上门服务，2=到店服务")Integer serviceMode, Integer pageCurr, Integer pageSize) {
			Integer objectId = tokenService.getLoginUser().getSysUser().getObjectId();
			PageInfo<TechnicianSubscribeVO> pageInfo = technicianSubscribeService.getTechnicianSubscribeByUserAndShop1(Long.valueOf(objectId), status, phone, name, serviceMode, pageCurr, 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);
			}

			@@ -76,7 +85,6 @@
			@GetMapping("/cancel")
			@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));