修改bug

puzhibing

2023-02-11 ea719b0443b8ccbc6d17349796936664ff3261d0

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java

@@ -81,11 +81,13 @@
        }
        Double slnt = Double.valueOf(startLonLat.split(",")[0]);
        Double slat = Double.valueOf(startLonLat.split(",")[1]);
        Double elnt = Double.valueOf(startLonLat.split(",")[0]);
        Double elat = Double.valueOf(startLonLat.split(",")[1]);
        Double elnt = Double.valueOf(endLonLat.split(",")[0]);
        Double elat = Double.valueOf(endLonLat.split(",")[1]);
        DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(slat, slnt, elat, elnt);
        if(null == distancematrix){
            return ResultUtil.error(language == 1 ? "获取预估距离出错" : language == 2 ? "Error getting estimated distance" : "Erreur lors de l'obtention de la distance estimée", new ArrayList<>());
        }else if(distancematrix.getDistance() == 0){
            return ResultUtil.error(language == 1 ? "未获取到有效的距离" : language == 2 ? "A valid distance was not obtained" : "La distance effective n’est pas acquise", new ArrayList<>());
        }
        long distance1 = distancematrix.getDistance();//距离（米）
        double distance1_ = Double.valueOf(distance1).doubleValue();
@@ -176,34 +178,34 @@


                //夜间服务处理逻辑
                Calendar s = Calendar.getInstance();
                s.setTime(date);
                s.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num16.split(" - ")[0].split(":")[0]));
                s.set(Calendar.MINUTE, Integer.valueOf(num16.split(" - ")[0].split(":")[1]));

                Calendar e = Calendar.getInstance();
                e.setTime(date);
                e.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num16.split(" - ")[1].split(":")[0]));
                e.set(Calendar.MINUTE, Integer.valueOf(num16.split(" - ")[1].split(":")[1]));

                if(date.getTime() > s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){
                    if(d > num8.doubleValue()){
                        yt1 = num20 * (num9 - num8);
                    }
                    if(d > num11.doubleValue()){
                        yt2 = num21 * (num12 - num11);
                    }
                    if(d > num14.doubleValue()){
                        yt3 = num22 * (d - num14);
                    }
                    amount = num17 + (d1 * num18) + (t1 * num19) + (wait * num7) + yt1 + yt2 + yt3;
                    ServerCarModelWarpper serverCarModelWarpper = ServerCarModelWarpper.getServerCarModelWarpper(map);
                    serverCarModelWarpper.setAmount(new BigDecimal(amount).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue());
                    serverCarModelWarpper.setMileage(d);
                    serverCarModelWarpper.setDuration(t);
                    data.add(serverCarModelWarpper);
                    continue;
                }
//                Calendar s = Calendar.getInstance();
//                s.setTime(date);
//                s.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num16.split(" - ")[0].split(":")[0]));
//                s.set(Calendar.MINUTE, Integer.valueOf(num16.split(" - ")[0].split(":")[1]));
//
//                Calendar e = Calendar.getInstance();
//                e.setTime(date);
//                e.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num16.split(" - ")[1].split(":")[0]));
//                e.set(Calendar.MINUTE, Integer.valueOf(num16.split(" - ")[1].split(":")[1]));
//
//                if(date.getTime() > s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){
//                    if(d > num8.doubleValue()){
//                        yt1 = num20 * (num9 - num8);
//                    }
//                    if(d > num11.doubleValue()){
//                        yt2 = num21 * (num12 - num11);
//                    }
//                    if(d > num14.doubleValue()){
//                        yt3 = num22 * (d - num14);
//                    }
//                    amount = num17 + (d1 * num18) + (t1 * num19) + (wait * num7) + yt1 + yt2 + yt3;
//                    ServerCarModelWarpper serverCarModelWarpper = ServerCarModelWarpper.getServerCarModelWarpper(map);
//                    serverCarModelWarpper.setAmount(new BigDecimal(amount).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue());
//                    serverCarModelWarpper.setMileage(d);
//                    serverCarModelWarpper.setDuration(t);
//                    data.add(serverCarModelWarpper);
//                    continue;
//                }


                //高峰时段处理逻辑