java/SuperSaveDriving.git

			@@ -996,8 +996,10 @@
			order.setStartTime(new Date());
			}
			//计算等待用户时长
			Integer w = new BigDecimal(Double.valueOf(System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 1000).intValue();
			order.setWaitTime(order.getWaitTime() + w);
			if(null != order.getStartWaitTime()){
			Integer w = new BigDecimal(Double.valueOf(System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 1000).intValue();
			order.setWaitTime(order.getWaitTime() + w);
			}
			order.setStartWaitTime(null);
			orderPositionService.initMap(order.getId());
			break;
			@@ -1176,6 +1178,9 @@
			Driver driver=null;
			OrderTransfer orderTransfer = new OrderTransfer();
			Order order = this.selectById(orderId);
			if(order.getState() > 104){
			return ResultUtil.error("订单不支持转单");
			}
			if(phone!=null && !"".equals(phone)) {
			Integer oldId = order.getDriverId();
			List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("phone", phone));
			@@ -1201,9 +1206,7 @@
			}else {
			order.setState(201);
			}
			if(order.getState() > 104){
			return ResultUtil.error("订单不支持转单");
			}

			order.setOldState(order.getState());

			this.updateById(order);