黔云通
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
liujie
6 天以前 729a5a0592cac7750e8b476c5fcb25bfc3ff8d25 
 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java


@@ -23,7 +23,6 @@


import com.stylefeng.guns.modular.system.util.*;


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;


@@ -666,6 +665,9 @@




    @Autowired


    private IPushOrderService pushOrderService;


    


    @Autowired


    private IOpenCityService openCityService;




    @Autowired


    private PushUtil pushUtil;


@@ -686,10 +688,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 +756,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){