From 13af2bc11b551befd11accfd66e601a013b57c6f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 22 七月 2024 14:25:54 +0800
Subject: [PATCH] 2.0bug修改
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 b280578..b369640 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
@@ -176,7 +176,7 @@
.ne("type", 1)
.isNotNull("orderType"));
}else{
- if (time == 5){
+ if (time == 5 && insertTime==null){
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
.eq("userType", 1)
.eq("objectId",1)
@@ -304,7 +304,9 @@
}
EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
- if (time!=null && time!=5 ){
+ if (time == 5 && insertTime==null){
+
+ }else{
settlementDetailEntityWrapper.between("createTime", start, end);
}
settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
@@ -493,7 +495,7 @@
EntityWrapper<TOrderLogistics> tOrderLogisticsEntityWrapper = new EntityWrapper<>();
// 司机手动结算金额
Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
- if (time!=null && time == 5){
+ if (time == 5 && insertTime==null){
// 余额充值wrapper
orderType = new EntityWrapper<TPubTransactionDetails>()
.eq("userType",1)
@@ -995,7 +997,7 @@
EntityWrapper<TOrderLogistics> tOrderLogisticsEntityWrapper = new EntityWrapper<>();
// 司机手动结算金额
Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
- if (time!=null && time == 5){
+ if (time == 5 && insertTime==null){
// 余额充值wrapper
orderType = new EntityWrapper<TPubTransactionDetails>()
.eq("userType",1)
@@ -1446,7 +1448,7 @@
LocalDate e = LocalDate.parse(endTime);
start = s.atStartOfDay();
end = e.atTime(LocalTime.MAX);
- }else if (time!=null) {
+ }else{
switch (time) {
case 1:
// 获取当天的 00:00:00 和 23:59:59
@@ -1498,7 +1500,7 @@
.ne("type", 1)
.isNotNull("orderType"));
}else{
- if (time == 5){
+ if (time == 5 && insertTime==null){
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
.eq("userType", 1)
.eq("objectId",1)
@@ -1514,7 +1516,9 @@
}
}
EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
- if (time!=null && time!=5){
+ if (time == 5 && insertTime==null){
+
+ }else{
settlementDetailEntityWrapper.between("createTime", start, end);
}
settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
--
Gitblit v1.7.1