修改bug

Pu Zhibing

3 天以前 cb7e84fe6e40f3ce3ed1fe3fb3b4c0da8c847793

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java

@@ -387,7 +387,7 @@
                break;
            case 2://出租
                OrderTaxi orderTaxi = orderTaxiService.selectById(orderId);
                if(null != orderTaxi && orderTaxi.getType() == 2){
                if((null != orderTaxi && orderTaxi.getType() == 2) || (null != orderTaxi && orderTaxi.getState() == 11)){
                    map = orderTaxiService.queryPushOrder(orderId);
                }else{
                    OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
@@ -1232,19 +1232,21 @@
                orderPrivateCar.setState(8);
                orderPrivateCarService.updateById(orderPrivateCar);
    
                Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
                Company company1 = companyService.selectById(driver.getCompanyId());
                //中台修改订单状态
                ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest();
                request1.setOrderId(orderPrivateCar.getTravelId());
                request1.setStatus(orderPrivateCar.getState());
                request1.setDriverId(driver.getEmpId().toString());
                if(2 == orderPrivateCar.getPromotion()){
                    Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
                    request1.setPromoterId(driver1.getEmpId().toString());
                if(ToolUtil.isNotEmpty(orderPrivateCar.getTravelId())){
                    Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
                    Company company1 = companyService.selectById(driver.getCompanyId());
                    //中台修改订单状态
                    ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest();
                    request1.setOrderId(orderPrivateCar.getTravelId());
                    request1.setStatus(orderPrivateCar.getState());
                    request1.setDriverId(driver.getEmpId().toString());
                    if(2 == orderPrivateCar.getPromotion()){
                        Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
                        request1.setPromoterId(driver1.getEmpId().toString());
                    }
                    request1.setSupplierShopId(company1.getEnterCode());
                    OrderUtil.modifyTravelItinerary(request1);
                }
                request1.setSupplierShopId(company1.getEnterCode());
                OrderUtil.modifyTravelItinerary(request1);
                
                userId = orderPrivateCar.getUserId();
                driverId = orderPrivateCar.getDriverId();
@@ -1276,19 +1278,21 @@
                orderTaxi.setState(8);
                orderTaxiService.updateById(orderTaxi);
    
                Driver driver1 = driverService.selectById(orderTaxi.getDriverId());
                Company company = companyService.selectById(driver1.getCompanyId());
                //中台修改订单状态
                ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
                request.setOrderId(orderTaxi.getTravelId());
                request.setStatus(orderTaxi.getState());
                request.setDriverId(driver1.getEmpId().toString());
                if(2 == orderTaxi.getPromotion()){
                    Driver driver2 = driverService.selectById(orderTaxi.getPromotionDriverId());
                    request.setPromoterId(driver2.getEmpId().toString());
                if(ToolUtil.isNotEmpty(orderTaxi.getTravelId())){
                    Driver driver1 = driverService.selectById(orderTaxi.getDriverId());
                    Company company = companyService.selectById(driver1.getCompanyId());
                    //中台修改订单状态
                    ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
                    request.setOrderId(orderTaxi.getTravelId());
                    request.setStatus(orderTaxi.getState());
                    request.setDriverId(driver1.getEmpId().toString());
                    if(2 == orderTaxi.getPromotion()){
                        Driver driver2 = driverService.selectById(orderTaxi.getPromotionDriverId());
                        request.setPromoterId(driver2.getEmpId().toString());
                    }
                    request.setSupplierShopId(company.getEnterCode());
                    OrderUtil.modifyTravelItinerary(request);
                }
                request.setSupplierShopId(company.getEnterCode());
                OrderUtil.modifyTravelItinerary(request);
                
                userId = orderTaxi.getUserId();
                driverId = orderTaxi.getDriverId();