修改bug

Pu Zhibing

5 天以前 cb7e84fe6e40f3ce3ed1fe3fb3b4c0da8c847793

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java

@@ -222,7 +222,7 @@
//        }

        // 是否推广订单
        Integer promotion = isPromotion(orderTaxi.getUserId());
        Integer promotion = isPromotion(orderTaxi.getUserId(), driver.getPlaceOfEmployment());
        if(promotion!=null){
            orderTaxi.setPromotion(2);
            Driver driver1 = driverService.selectById(promotion);
@@ -251,6 +251,7 @@
            orderTaxi.setTravelId(travelItinerary);
        }else{
            //改派抢单
            if(ToolUtil.isNotEmpty(orderTaxi.getTravelId())){
            Company company1 = companyService.selectById(driver.getCompanyId());
            //中台修改订单状态
            ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest();
@@ -263,6 +264,7 @@
            }
            request1.setSupplierShopId(company1.getEnterCode());
            OrderUtil.modifyTravelItinerary(request1);
            }
        }
        this.updateById(orderTaxi);

@@ -336,11 +338,11 @@

        return ResultUtil.success(orderTaxi.getId());
    }
    private Integer isPromotion(Integer userId){
    private Integer isPromotion(Integer userId, String code){
        UserInfo userInfo = userInfoMapper.selectById(userId);
        if(userInfo.getBindDriverId()!=null && userInfo.getBindExpireDate().getTime()<=System.currentTimeMillis()){
            String registAreaCode = userInfo.getRegistAreaCode();
            TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("state",1).eq("districtCode", registAreaCode).le("startTime", new Date()).ge("endTime", new Date()).last("AND FIND_IN_SET(" + 2 + ", bizType) limit 1"));
            TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("state",1)
                    .eq("districtCode", code).le("startTime", new Date()).ge("endTime", new Date()).last("AND FIND_IN_SET(" + 2 + ", bizType) limit 1"));
            if(tDriverPromotionActivity!=null){
                return userInfo.getBindDriverId();
            }
@@ -379,6 +381,7 @@
        orderTaxi.setOrderType(orderPrivateCar.getOrderType());
        orderTaxi.setOrderSource(orderPrivateCar.getOrderSource());
        orderTaxi.setIsDelete(1);
        orderTaxi.setIsReassign(1);
        return orderTaxi;
    }

@@ -531,6 +534,7 @@
        }
        this.updateById(orderTaxi);
    
        if(ToolUtil.isNotEmpty(orderTaxi.getTravelId())){
        Driver driver = driverService.selectById(orderTaxi.getDriverId());
        Company company = companyService.selectById(driver.getCompanyId());
        //中台修改订单状态
@@ -544,6 +548,7 @@
        }
        request.setSupplierShopId(company.getEnterCode());
        OrderUtil.modifyTravelItinerary(request);
        }

        // TODO: 2020/6/5 推送状态
        new Thread(new Runnable() {
@@ -589,6 +594,7 @@
        this.updateById(orderTaxi);
    
        Driver driver = driverService.selectById(orderTaxi.getDriverId());
        if(ToolUtil.isNotEmpty(orderTaxi.getTravelId())){
        Company company = companyService.selectById(driver.getCompanyId());
        //中台修改订单状态
        ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
@@ -601,6 +607,7 @@
        }
        request.setSupplierShopId(company.getEnterCode());
        OrderUtil.modifyTravelItinerary(request);
        }

        //回滚司机状态为空闲
        driver.setState(2);
@@ -642,6 +649,7 @@
        this.updateById(orderTaxi);
    
        Driver driver = driverService.selectById(orderTaxi.getDriverId());
        if(ToolUtil.isNotEmpty(orderTaxi.getTravelId())){
        Company company1 = companyService.selectById(driver.getCompanyId());
        //中台修改订单状态
        ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest();
@@ -654,6 +662,7 @@
        }
        request1.setSupplierShopId(company1.getEnterCode());
        OrderUtil.modifyTravelItinerary(request1);
        }

        //回滚司机状态为空闲
        driver.setState(2);