java/QianYunTong.git

			@@ -21,6 +21,8 @@
			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 org.apache.commons.lang.time.DateFormatUtils;
			@@ -189,6 +191,20 @@
			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());
			// qyt 改派直接推送
			@@ -201,6 +217,19 @@
			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());