修改bug

puzhibing

2023-07-24 6cabe9ee512ddd3d04c4e10b39d34641ecc0e844

修改bug

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderPositionService.java

@@ -24,4 +24,8 @@
     * @throws Exception
     */
    List<OrderPositionWarpper> queryPosition(Integer orderId, Integer orderType) throws Exception;



    void initMap(Long orderId) throws Exception;
}

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java

@@ -49,7 +49,7 @@
    public void saveOrderPosition(DriverPositionWarpper driverPositionWarpper) throws Exception {
        Integer orderId = driverPositionWarpper.getOrderId();
        Order order = orderService.selectById(orderId);
        if(order.getState() != 105){
        if(order.getState() != 105 && order.getState() != 401){
            return;
        }
        Integer orderType = driverPositionWarpper.getOrderType();
@@ -70,6 +70,14 @@
            String toLonLat = orderPositionWarpper1.getLon() + "," + orderPositionWarpper1.getLat();
            Map<String, Double> distance = GeodesyUtil.getDistance(fromLonLat, toLonLat);
            Double wgs84 = distance.get("WGS84");

//            long timeMillis = System.currentTimeMillis();
//            long time = orderPositionWarpper1.getInsertTime().getTime();
//            long t = timeMillis - time;
//            if(wgs84 >= 200 && t <= 8){//排除位置漂移
//                return;
//            }

            if(wgs84 >= 50){//5秒165米
                OrderPositionWarpper orderPositionWarpper = new OrderPositionWarpper();
                BeanUtils.copyProperties(driverPositionWarpper, orderPositionWarpper);
@@ -103,6 +111,14 @@
        Order order = orderService.selectById(driverPositionWarpper.getOrderId());
        Double wgs84 = distance.get("WGS84");
        Integer num = map.get(order.getId().toString());

//        long timeMillis = System.currentTimeMillis();
//        long time = orderPositionWarpper.getInsertTime().getTime();
//        long t = timeMillis - time;
//        if(wgs84 >= 200 && t <= 8){//排除位置漂移
//            return;
//        }

        if(50 < wgs84){//5秒165米
            order.setActualMileage(order.getActualMileage() + wgs84.intValue());
            orderService.updateById(order);
@@ -119,10 +135,14 @@
                }
            }
        }
        if(50 >= wgs84 && 12 <= (null == num ? 0 : num)){//1分钟（5秒上传一次数据）

        if(50 >= wgs84 && 3 <= (null == num ? 0 : num)){//20秒（5秒上传一次数据）
            Integer integer = map.get(order.getId().toString());
            map.put(order.getId().toString(), null == integer ? 0 : integer++);
            map.put(order.getId().toString(), null == integer ? 0 : integer + 1);
            //进入等待状态
            if(order.getState() == 401){
                return;
            }
            ProcessOperationsWarpper processOperationsWarpper = new ProcessOperationsWarpper();
            processOperationsWarpper.setOrderId(order.getId());
            processOperationsWarpper.setState(401);
@@ -132,9 +152,9 @@
                e.printStackTrace();
            }
        }
        if(50 >= wgs84 && 12 > (null == num ? 0 : num)){
        if(50 >= wgs84 && 3 > (null == num ? 0 : num)){
            Integer integer = map.get(order.getId().toString());
            map.put(order.getId().toString(), null == integer ? 0 : integer++);
            map.put(order.getId().toString(), null == integer ? 0 : integer + 1);
        }
    }

@@ -172,4 +192,9 @@
    }


    @Override
    public void initMap(Long orderId) throws Exception {
        map.put(orderId.toString(), 0);
    }

}

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java

@@ -111,6 +111,9 @@
    @Autowired
    private IAgentService agentService;

    @Autowired
    private IOrderPositionService orderPositionService;

    @Value("${callbackPath}")
    private String callbackPath;//支付回调网关地址

@@ -974,6 +977,7 @@
                Integer w = new BigDecimal(Double.valueOf(System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 1000).intValue();
                order.setWaitTime(order.getWaitTime() + w);
                order.setStartWaitTime(null);
                orderPositionService.initMap(order.getId());
                break;
            case 106:
                order.setGetoffTime(new Date());