修改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,6 +1232,7 @@
                orderPrivateCar.setState(8);
                orderPrivateCarService.updateById(orderPrivateCar);
    
                if(ToolUtil.isNotEmpty(orderPrivateCar.getTravelId())){
                Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
                Company company1 = companyService.selectById(driver.getCompanyId());
                //中台修改订单状态
@@ -1245,6 +1246,7 @@
                }
                request1.setSupplierShopId(company1.getEnterCode());
                OrderUtil.modifyTravelItinerary(request1);
                }
                
                userId = orderPrivateCar.getUserId();
                driverId = orderPrivateCar.getDriverId();
@@ -1276,6 +1278,7 @@
                orderTaxi.setState(8);
                orderTaxiService.updateById(orderTaxi);
    
                if(ToolUtil.isNotEmpty(orderTaxi.getTravelId())){
                Driver driver1 = driverService.selectById(orderTaxi.getDriverId());
                Company company = companyService.selectById(driver1.getCompanyId());
                //中台修改订单状态
@@ -1289,6 +1292,7 @@
                }
                request.setSupplierShopId(company.getEnterCode());
                OrderUtil.modifyTravelItinerary(request);
                }
                
                userId = orderTaxi.getUserId();
                driverId = orderTaxi.getDriverId();