From bfa0b11dfbfe5b71e11f4544e688e4d9f325d1b5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 09 六月 2025 10:26:51 +0800
Subject: [PATCH] 修改bug和管理后台报表
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 10 ++++++----
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java | 8 ++++----
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 12 +++++++-----
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 8 ++++----
4 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index 2bd71cc..1972a3c 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/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);
@@ -1193,11 +1199,7 @@
Integer language1 = userInfo.getLanguage();
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() {
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 33d133f..2c52b37 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/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() {
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
index 833c524..ab74953 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
+++ b/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));
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
index 6ccb928..266ed8e 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
+++ b/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);
}
--
Gitblit v1.7.1