java/JiaDianHuiShou.git

			@@ -61,13 +61,16 @@
			@GetMapping(value = "/page")
			@ApiImplicitParams({
			@ApiImplicitParam(value = "师傅名称", name = "workerName", dataType = "String"),
			@ApiImplicitParam(value = "预约人名称", name = "reservationName", dataType = "String"),
			@ApiImplicitParam(value = "订单编号", name = "orderNumber", dataType = "String"),
			@ApiImplicitParam(value = "下单用户名称", name = "userName", dataType = "String"),
			@ApiImplicitParam(value = "下单用户手机号", name = "reservationPhone", dataType = "String"),
			@ApiImplicitParam(value = "地址", name = "reservationAddress", dataType = "String"),
			@ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
			@ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
			})
			public R<Page<ChangeDispatch>> queryPageList(String workerName, String orderNumber, String userName,String reservationAddress,
			String reservationName,String reservationPhone,
			@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
			@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
			LoginUser loginUser = tokenService.getLoginUser();
			@@ -83,7 +86,8 @@
			changeDispatchRequest.setPageNum(pageNum);
			changeDispatchRequest.setPageSize(pageSize);
			changeDispatchRequest.setCityList(cityList);

			changeDispatchRequest.setReservationName(reservationName);
			changeDispatchRequest.setReservationPhone(reservationPhone);
			Integer franchiseeId = loginUser.getSysUser().getFranchiseeId();
			if (franchiseeId!=null) {
			Franchisee byId = franchiseeService.getById(franchiseeId);
			@@ -163,10 +167,14 @@
			@ApiOperation(value = "订单改派师傅", tags = {"后台-系统设置-订单改派管理"})
			@GetMapping(value = "/changeWorker")
			@ApiImplicitParams({
			@ApiImplicitParam(value = "改派订单id", name = "changeId", dataType = "Integer", required = true),
			@ApiImplicitParam(value = "师傅id", name = "workerId", dataType = "Integer", required = true)
			@ApiImplicitParam(value = "改派订单id", name = "changeId", dataType = "String", required = true),
			@ApiImplicitParam(value = "订单id", name = "orderId", dataType = "String", required = true),
			@ApiImplicitParam(value = "师傅id", name = "workerId", dataType = "Integer", required = true),
			@ApiImplicitParam(value = "时间", name = "arriveTime", dataType = "String", required = true),
			})
			public R<String> changeWorker(@RequestParam String changeId, @RequestParam Integer workerId,@RequestParam String orderId,@RequestParam String reason,
			public R<String> changeWorker(@RequestParam String changeId,
			@RequestParam String orderId,
			@RequestParam Integer workerId,
			@RequestParam String arriveTime) {
			MasterWorker masterWorker = masterWorkerService.lambdaQuery()
			.eq(MasterWorker::getId, workerId).eq(MasterWorker::getIsDelete, 0).one();
			@@ -184,7 +192,7 @@
			NettyWebSocketController.sendMsgToClient(context, "您有一条新的订单，请注意查收！");
			}

			dispatchClient.changeReason(orderId, reason);
			// dispatchClient.changeReason(orderId, reason);
			orderClient.updateArrivalTime(orderId,arriveTime);
			return R.ok();
			// try {