java/QianYunTong.git

			@@ -21,9 +21,10 @@
			import com.stylefeng.guns.modular.system.model.*;
			import com.stylefeng.guns.modular.system.service.*;
			import com.stylefeng.guns.modular.system.util.*;
			import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil;
			import com.stylefeng.guns.modular.system.util.qianyuntong.model.ModifyTravelItineraryRequest;
			import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
			import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
			import com.stylefeng.guns.modular.taxi.service.impl.OrderTaxiServiceImpl;
			import org.apache.commons.lang.time.DateFormatUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			@@ -189,6 +190,20 @@
			orderPrivateCar.setState(11);
			orderPrivateCar.setReassignNotice(2);
			orderPrivateCarService.updateById(orderPrivateCar);

			Company company = companyService.selectById(driver.getCompanyId());
			//中台修改订单状态
			ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
			request.setOrderId(orderPrivateCar.getTravelId());
			request.setStatus(orderPrivateCar.getState());
			request.setDriverId(driver.getEmpId().toString());
			if(2 == orderPrivateCar.getPromotion()){
			Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
			request.setPromoterId(driver1.getEmpId().toString());
			}
			request.setSupplierShopId(company.getEnterCode());
			OrderUtil.modifyTravelItinerary(request);


			//添加已收入明细
			// incomeService.saveData(1, orderPrivateCar.getCompanyId(), 4, orderPrivateCar.getId(), 1, reassign.getMoney());
			@@ -201,7 +216,20 @@
			orderTaxi.setState(11);
			orderTaxi.setReassignNotice(2);
			orderTaxiService.updateById(orderTaxi);


			Company company1 = companyService.selectById(driver.getCompanyId());
			//中台修改订单状态
			ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest();
			request1.setOrderId(orderTaxi.getTravelId());
			request1.setStatus(orderTaxi.getState());
			request1.setDriverId(driver.getEmpId().toString());
			if(2 == orderTaxi.getPromotion()){
			Driver driver1 = driverService.selectById(orderTaxi.getPromotionDriverId());
			request1.setPromoterId(driver1.getEmpId().toString());
			}
			request1.setSupplierShopId(company1.getEnterCode());
			OrderUtil.modifyTravelItinerary(request1);

			//添加已收入明细
			// incomeService.saveData(1, orderTaxi.getCompanyId(), 4, orderTaxi.getId(), 2, reassign.getMoney());

			@@ -666,6 +694,9 @@

			@Autowired
			private IPushOrderService pushOrderService;

			@Autowired
			private IOpenCityService openCityService;

			@Autowired
			private PushUtil pushUtil;
			@@ -686,10 +717,11 @@
			if (ToolUtil.isNotEmpty(vehicle)) {
			integers = JSON.parseArray(vehicle).toJavaList(Integer.class);
			}
			Company query = companyCityService.query(String.valueOf(orderTaxi.getStartLon()), String.valueOf(orderTaxi.getStartLat()));//获取起点所属分公司
			List<PushOrder> querys = pushOrderService.querys(null, 2, query.getId());//获取需要推送的次数
			OpenCity openCity = openCityService.openCity1(orderTaxi.getStartLon().toString(), orderTaxi.getStartLat().toString());
			List<PushOrder> querys = pushOrderService.querys(null, 2, openCity.getId());//获取需要推送的次数
			for (int i = 1; i <=6; i++) {
			PushOrder pushOrder = pushOrderService.querys(i, 2, query.getId()).get(0);
			int finalI = i;
			PushOrder pushOrder = querys.stream().filter(s -> s.getType() == (finalI <= 3 ? finalI : 3)).findFirst().orElse(null);
			System.out.println("pushOrder:" + pushOrder);
			//获取空闲司机
			List<Driver> list = driverService.queryIdleDriver(2, orderTaxi.getStartLon(), orderTaxi.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
			@@ -753,14 +785,15 @@
			if(ToolUtil.isNotEmpty(vehicle)){
			integers = JSON.parseArray(vehicle).toJavaList(Integer.class);
			}
			Company query = companyCityService.query(String.valueOf(orderPrivateCar.getStartLon()), String.valueOf(orderPrivateCar.getStartLat()));//获取起点所属分公司
			List<PushOrder> querys = pushOrderService.querys(null, 1, query.getId());//获取需要推送的次数
			OpenCity openCity = openCityService.openCity1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
			List<PushOrder> querys = pushOrderService.querys(null, 1, openCity.getId());//获取需要推送的次数
			for(int i = 1; i <= 6; i++){
			OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(id);
			if (null == orderPrivateCar \|\| orderPrivateCar.getState() > 1) {
			break;
			}
			PushOrder pushOrder = pushOrderService.querys(i, 1, query.getId()).get(0);
			int finalI = i;
			PushOrder pushOrder = querys.stream().filter(s -> s.getType() == (finalI <= 3 ? finalI : 3)).findFirst().orElse(null);
			System.out.println("pushOrder:"+pushOrder);
			int i2 = pushOrder.getPushTime() / 10;
			if(i2==0){