zhibing.pu
2024-09-11 c888a5547f9d7b5ca7a04b7c7d0692197b0ec202
修改bug
2个文件已修改
21 ■■■■ 已修改文件
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -389,10 +389,8 @@
                        toLonLat = fromLonLat;
                    }
                }
                System.err.println("======服务里程======"+sum);
                if(counts < 5){
                    orderPrivateCar.setMileage(sum);
                    orderPrivateCar.setIsAbnormal(1);
                //存储轨迹
                    // 将数据存储到文件中
                    File file = new File(filePath + orderId + "_" + 1 + ".txt");
                    if(!file.exists()){
@@ -404,6 +402,19 @@
                    out.write(JSON.toJSONString(orderPositions));
                    out.flush();
                    out.close();
                //计算里程
                //5分钟
                if(counts > 60){
                    orderPrivateCar.setMileage(sum);
                    orderPrivateCar.setIsAbnormal(0);
                }else{
                    //获取预估里程,使用预估里程作为行驶里程计算金额
                    String origins = orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat();
                    String destination = orderPrivateCar.getEndLon() + "," + orderPrivateCar.getEndLat();
                    Map<String, String> distance = gdMapElectricFenceUtil.getDistance(origins, destination, 1);
                    String distance1 = distance.get("distance");
                    orderPrivateCar.setMileage(Double.valueOf(distance1));
                    orderPrivateCar.setIsAbnormal(1);
                }
                break;
        }
ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
@@ -621,6 +621,8 @@
    @RequestMapping(value = "/updateAuth")
    @ResponseBody
    public Object updateAuth(TCar tCar,String zcModel,@RequestParam String serverBox) {
        //删除业务
        tCarServiceService.delete(new EntityWrapper<TCarService>().eq("carId",tCar.getId()));
        //添加经营业务
        if(tCar.getAuthState()==2){
            String[] serverArray = serverBox.split(",");