java/QianYunTong.git

			@@ -20,12 +20,10 @@
			import com.stylefeng.guns.modular.crossCity.warpper.OrderCrossCityWarpper;
			import com.stylefeng.guns.modular.specialTrain.dao.OrderPrivateCarMapper;
			import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
			import com.stylefeng.guns.modular.system.dao.PhoneMapper;
			import com.stylefeng.guns.modular.system.dao.RegionMapper;
			import com.stylefeng.guns.modular.system.dao.SysIntegralMapper;
			import com.stylefeng.guns.modular.system.dao.UserInfoMapper;
			import com.stylefeng.guns.modular.system.dao.*;
			import com.stylefeng.guns.modular.system.model.*;
			import com.stylefeng.guns.modular.system.service.*;
			import com.stylefeng.guns.modular.system.service.impl.CarServiceImpl;
			import com.stylefeng.guns.modular.system.util.*;
			import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
			import com.stylefeng.guns.modular.system.warpper.MerchantCouponListWarpper;
			@@ -160,6 +158,10 @@

			@Value("${callbackPath}")
			private String callbackPath;
			@Autowired
			private CarModelMapper carModelMapper;
			@Autowired
			private CarServiceImpl carServiceImpl;


			/**
			@@ -296,7 +298,13 @@

			//还原座位数
			LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(orderCrossCity.getLineShiftDriverId());
			lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() + orderCrossCity.getPeopleNumber());
			if(1 == orderCrossCity.getTravelMode()){
			lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() + orderCrossCity.getPeopleNumber());
			}else{
			Car car = carServiceImpl.selectById(driver.getCarId());
			CarModel carModel = carModelMapper.selectById(car.getCarModelId());
			lineShiftDriver.setLaveSeat(carModel.getSeat() - 1);
			}
			lineShiftDriver.setLaveSeatNumber(
			(ToolUtil.isNotEmpty(lineShiftDriver.getLaveSeatNumber()) ? lineShiftDriver.getLaveSeatNumber() + "," : "") +
			orderCrossCity.getSeatNumber()
			@@ -305,7 +313,7 @@

			//修改司机空闲状态
			List<OrderCrossCity> orderCrossCities = orderCrossCityMapper.queryWithin30Minutes(orderCrossCity.getDriverId(), 2, 3, 4, 5, 11);
			if(orderCrossCities.size() == 0){
			if(orderCrossCities.size() <= 1){
			driver = driverService.selectById(orderCrossCity.getDriverId());
			driver.setState(2);
			driverService.updateById(driver);