From b649aa3767a678bb4b7b12069464a2929503b9e2 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 23 十月 2024 18:34:11 +0800
Subject: [PATCH] 2.0bug修改
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
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 27ba38b..37cf815 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
@@ -221,7 +221,10 @@
continue;
}
// 查询订单信息
- TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
+// TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>()
+ .eq("id", income.getIncomeId())
+ .between("insertTime", start, end));
if (tOrderPrivateCar==null){
continue;
}
@@ -289,7 +292,10 @@
}
// 小件物流
// 查询订单信息
- TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
+// TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
+ TOrderLogistics tOrderLogistics = orderLogisticsService.selectOne(new EntityWrapper<TOrderLogistics>()
+ .eq("id", income.getIncomeId())
+ .between("insertTime", start, end));
if (tOrderLogistics==null){
continue;
}
@@ -367,7 +373,10 @@
case 1:
// 专车订单
- TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
+// TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>()
+ .eq("id", settlementDetail.getOrderId())
+ .between("insertTime", start, end));
if (tOrderPrivateCar==null){
continue;
}
@@ -415,7 +424,10 @@
case 4:
// 小件物流
// 查询订单信息
- TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(settlementDetail.getOrderId());
+// TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(settlementDetail.getOrderId());
+ TOrderLogistics tOrderLogistics = orderLogisticsService.selectOne(new EntityWrapper<TOrderLogistics>()
+ .eq("id", settlementDetail.getOrderId())
+ .between("insertTime", start, end));
if (tOrderLogistics==null){
continue;
}
@@ -1921,7 +1933,11 @@
continue;
}
// 查询订单信息
- TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
+// TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>()
+ .eq("id", income.getIncomeId())
+ .between("insertTime", start, end));
+
if (tOrderPrivateCar==null){
continue;
}
@@ -1989,7 +2005,10 @@
}
// 小件物流
// 查询订单信息
- TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
+// TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
+ TOrderLogistics tOrderLogistics = orderLogisticsService.selectOne(new EntityWrapper<TOrderLogistics>()
+ .eq("id", income.getIncomeId())
+ .between("insertTime", start, end));
if (tOrderLogistics==null){
continue;
}
@@ -2057,7 +2076,10 @@
switch (settlementDetail.getOrderType()){
case 1:
// 专车订单
- TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
+// TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>()
+ .eq("id", settlementDetail.getOrderId())
+ .between("insertTime", start, end));
if (tOrderPrivateCar==null){
continue;
}
@@ -2103,7 +2125,10 @@
case 4:
// 小件物流
// 查询订单信息
- TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(settlementDetail.getOrderId());
+// TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(settlementDetail.getOrderId());
+ TOrderLogistics tOrderLogistics = orderLogisticsService.selectOne(new EntityWrapper<TOrderLogistics>()
+ .eq("id", settlementDetail.getOrderId())
+ .between("insertTime", start, end));
if (tOrderLogistics==null){
continue;
}
--
Gitblit v1.7.1