修改bug和管理后台报表

Pu Zhibing

5 天以前 b1f2f102034b4433201225b67a9fc78c08e532f0

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java

@@ -178,8 +178,7 @@
        Driver driver = driverService.selectById(uid);
        orderLogistics.setDriverId(uid);
        orderLogistics.setCarId(driver.getCarId());
        orderLogistics.setCompanyId(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
                driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
        orderLogistics.setCompanyId(driver.getCompanyId());
        orderLogistics.setState(2);
        orderLogistics.setSnatchOrderTime(new Date());
        if(!StringUtils.hasLength(orderLogistics.getTripId())){
@@ -437,6 +436,9 @@
                tripStatus = "ENROUTE_TO_DROPOFF";
                break;
            case 6://结束服务
                if(null == lon || null == lat){
                    return ResultUtil.error(language == 1 ? "无效的经纬度" : language == 2 ? "Invalid longitude and latitude" : "Longitude et latitude non valides");
                }
                orderLogistics.setGetoffLon(lon);
                orderLogistics.setGetoffLat(lat);
                orderLogistics.setGetoffAddress(address);
@@ -568,8 +570,7 @@
        Driver driver = driverService.selectById(uid);
        orderLogistics.setDriverId(uid);
        orderLogistics.setCarId(driver.getCarId());
        orderLogistics.setCompanyId(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
                driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
        orderLogistics.setCompanyId(driver.getCompanyId());
        orderLogistics.setState(2);
        Date date = new Date();
        orderLogistics.setSnatchOrderTime(date);
@@ -1073,7 +1074,27 @@
        if(orderLogistics.getArriveTime()==null){
            orderLogistics.setArriveTime(orderLogistics.getStartServiceTime());
        }
    
        //使用原始里程计算费用
        orderLogistics = this.setMoney(orderLogistics, 0D, 0D);//计算费用
        Double mileage = orderLogistics.getMileage();
        Double orderMoney1 = orderLogistics.getOrderMoney();
        //使用预估里程计算费用
        Double startLat = orderLogistics.getStartLat();
        Double startLon = orderLogistics.getStartLon();
        Double getoffLon = orderLogistics.getGetoffLon();
        Double getoffLat = orderLogistics.getGetoffLat();
        DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(startLat, startLon, getoffLat, getoffLon, orderLogistics.getTripId());
        orderLogistics.setMileage(distancematrix.getDistance().doubleValue());
        orderLogistics = this.setMoney(orderLogistics, 0D, 0D);
        Double orderMoney2 = orderLogistics.getOrderMoney();
        //如果原始金额小于预估金额，且比例小于95%，则使用预估金额
        if(orderMoney1.compareTo(orderMoney2) >= 0 || orderMoney1 / orderMoney2 >= 0.95){
            //原始金额大于预估金额或者比例大于0.95，则使用原始里程重新计算费用
            orderLogistics.setMileage(mileage);
            orderLogistics = this.setMoney(orderLogistics, 0D, 0D);//计算费用
        }
        
        orderLogistics.setPayManner(type);
        orderLogistics.setParkMoney(null == parkingFee ? 0D : parkingFee);
        orderLogistics.setRoadTollMoney(null == crossingFee ? 0D : crossingFee);
@@ -1123,11 +1144,11 @@
            orderLogistics.setState(7);
        }
        
        Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(orderLogistics.getBindId(),orderLogistics.getTelX());
        if(String.valueOf(map.get("code")).equals("200")){
            orderLogistics.setTelX("");
            orderLogistics.setBindId("");
        }
//        Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(orderLogistics.getBindId(),orderLogistics.getTelX());
//        if(String.valueOf(map.get("code")).equals("200")){
//            orderLogistics.setTelX("");
//            orderLogistics.setBindId("");
//        }
        this.updateById(orderLogistics);
        //修改行程数据
        Car car = carService.selectById(orderLogistics.getCarId());