java/qijisheng.git

			@@ -52,11 +52,11 @@
			@ApiOperation(value = "预约列表", tags = {"门店-预约列表"})
			public R<PageInfo<TechnicianSubscribeVO>> shoplist(@ApiParam(value = "状态") Integer status,
			@ApiParam("电话")String phone,
			@ApiParam("姓名")String name,
			@ApiParam("姓名")String userName,
			@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);
			PageInfo<TechnicianSubscribeVO> pageInfo = technicianSubscribeService.getTechnicianSubscribeByUserAndShop1(Long.valueOf(sysUser.getObjectId()), status, phone, userName, serviceMode, pageCurr, pageSize);
			return R.ok(pageInfo);
			}

			@@ -82,15 +82,7 @@
			}


			/**
			* 预约技师
			*/
			@PostMapping("/switchingTechnician")
			@ApiOperation(value = "切换技师", notes = "切换技师", tags = {"小程序-个人中心-门店管理-预约列表"})
			public R<Void> switchingTechnician(@RequestBody TechnicianSubscribe technicianSubscribe) {
			technicianSubscribeService.switchingTechnician(technicianSubscribe);
			return R.ok();
			}



			/**
			@@ -149,7 +141,7 @@
			@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)));
			.eq(TechnicianSubscribe::getDelFlag, 0).in(TechnicianSubscribe::getStatus, Arrays.asList(0, 1)).orderByDesc(TechnicianSubscribe::getCreateTime));
			return R.ok(list);
			}
			}