修改bug和管理后台报表

Pu Zhibing

2025-06-09 bfa0b11dfbfe5b71e11f4544e688e4d9f325d1b5

修改bug和管理后台报表

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

@@ -1150,6 +1150,12 @@
//            orderLogistics.setBindId("");
//        }
        this.updateById(orderLogistics);
    
        //回滚司机状态为空闲
        Driver driver = driverService.selectById(orderLogistics.getDriverId());
        driver.setState(2);
        driverService.updateById(driver);
        
        //修改行程数据
        Car car = carService.selectById(orderLogistics.getCarId());
        boolean updateTrip = fleetEngineUtil.updateTrip("COMPLETE", car.getVehicleId(), null, orderLogistics.getTripId(), null, null, null, null, orderLogistics.getId(), 4);
@@ -1194,10 +1200,6 @@
        systemNoticeService.addSystemNotice(1, language1 == 1 ? "司机已结束本次行程，谢谢使用" : language1 == 2 ?
                "The driver has finished the trip,thank you for using I-GO" : "Le chauffeur a terminé le trajet, merci d'utiliser I-GO", orderLogistics.getUserId());
        
        //回滚司机状态为空闲
        Driver driver = driverService.selectById(orderLogistics.getDriverId());
        driver.setState(2);
        driverService.updateById(driver);
    
        OrderLogistics finalOrderTaxi = orderLogistics;
        new Thread(new Runnable() {

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java

@@ -753,6 +753,11 @@
//        }
        this.updateById(orderPrivateCar);
        
        //回滚司机状态为空闲
        Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
        driver.setState(2);
        driverService.updateById(driver);
        
        //修改行程数据
        Car car = carService.selectById(orderPrivateCar.getCarId());
        boolean updateTrip = fleetEngineUtil.updateTrip("COMPLETE", car.getVehicleId(), null, orderPrivateCar.getTripId(), null, null, null, null, orderPrivateCar.getId(), 1);
@@ -798,10 +803,7 @@
        systemNoticeService.addSystemNotice(1, language1 == 1 ? "司机已结束本次行程，谢谢使用" : language1 == 2 ?
                "The driver has finished the trip,thank you for using I-GO" : "Le chauffeur a terminé le trajet, merci d'utiliser I-GO", orderPrivateCar.getUserId());

        //回滚司机状态为空闲
        Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
        driver.setState(2);
        driverService.updateById(driver);
        

        OrderPrivateCar finalOrderTaxi = orderPrivateCar;
        new Thread(new Runnable() {

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java

@@ -186,13 +186,13 @@
        if (time == 5 && !StringUtils.hasLength(insertTime)){
            incomes = tIncomeService.selectList(new EntityWrapper<Income>()
                    .eq("userType", 1)
                    .eq("objectId",1)
                    .eq(null != company, "objectId",company)
                    .ne("type", 1)
                    .isNotNull("orderType"));
        }else{
            incomes = tIncomeService.selectList(new EntityWrapper<Income>()
                    .eq("userType", 1)
                    .eq("objectId",1)
                    .eq(null != company, "objectId",company)
                    .ne("type", 1)
                    .isNotNull("orderType")
                    .between("insertTime", start, end));
@@ -1796,13 +1796,13 @@
        if (time == 5 && !StringUtils.hasLength(insertTime)){
            incomes = tIncomeService.selectList(new EntityWrapper<Income>()
                    .eq("userType", 1)
                    .eq("objectId",1)
                    .eq(null != company, "objectId",company)
                    .ne("type", 1)
                    .isNotNull("orderType"));
        }else{
            incomes = tIncomeService.selectList(new EntityWrapper<Income>()
                    .eq("userType", 1)
                    .eq("objectId",1)
                    .eq(null != company, "objectId",company)
                    .ne("type", 1)
                    .isNotNull("orderType")
                    .between("insertTime", start, end));

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java

@@ -1115,7 +1115,7 @@
            // 司机奖励
            between4 = new EntityWrapper<DriverActivityHistory>()
                    .eq("carryOut", 2)
                    .in(!collect.isEmpty(), "activityId", collect)
                    .in(!collect.isEmpty(), "driverActivityId", collect)
            ;
        } else {
            // 专车wrapper
@@ -1142,7 +1142,7 @@
            // 司机奖励
            between4 = new EntityWrapper<DriverActivityHistory>()
                    .eq("carryOut", 2)
                    .in(!collect.isEmpty(), "activityId", collect)
                    .in(!collect.isEmpty(), "driverActivityId", collect)
                    .between("insertTime", start, end);
        }
        
@@ -1464,7 +1464,7 @@
            // 司机奖励
            between4 = new EntityWrapper<DriverActivityHistory>()
                    .eq("carryOut", 2)
                    .in(!collect.isEmpty(), "activityId", collect)
                    .in(!collect.isEmpty(), "driverActivityId", collect)
            ;
        } else {
            // 专车wrapper
@@ -1493,7 +1493,7 @@
            // 司机奖励
            between4 = new EntityWrapper<DriverActivityHistory>()
                    .eq("carryOut", 2)
                    .in(!collect.isEmpty(), "activityId", collect)
                    .in(!collect.isEmpty(), "driverActivityId", collect)
                    .between("insertTime", start, end);
        }