From f3839fff3c7da7f1942cfad520cfe393def35a04 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 12 三月 2025 18:28:00 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 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 4a57511..8afc55f 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
@@ -190,7 +190,19 @@
EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
settlementDetailEntityWrapper.between("createTime", start, end);
if (state!=null && state == 2){
- settlementDetailEntityWrapper.eq("paymentStatus", 2);
+ List<SettlementRecord> paymentStatus = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>().eq("paymentStatus", 1));
+ if(paymentStatus.size() > 0){
+ settlementDetailEntityWrapper.in("settlementRecordId", paymentStatus.stream().map(SettlementRecord::getId).collect(Collectors.toList()));
+ }else{
+ settlementDetailEntityWrapper.eq("settlementRecordId", 0);
+ }
+ }else if (state!=null && state == 1){
+ List<SettlementRecord> paymentStatus = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>().eq("paymentStatus", 2));
+ if(paymentStatus.size() > 0){
+ settlementDetailEntityWrapper.in("settlementRecordId", paymentStatus.stream().map(SettlementRecord::getId).collect(Collectors.toList()));
+ }else{
+ settlementDetailEntityWrapper.eq("settlementRecordId", 0);
+ }
}
if (time == 5 && !StringUtils.hasLength(insertTime)){
@@ -1793,7 +1805,19 @@
EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
settlementDetailEntityWrapper.between("createTime", start, end);
if (state!=null && state == 2){
- settlementDetailEntityWrapper.eq("paymentStatus", 2);
+ List<SettlementRecord> paymentStatus = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>().eq("paymentStatus", 1));
+ if(paymentStatus.size() > 0){
+ settlementDetailEntityWrapper.in("settlementRecordId", paymentStatus.stream().map(SettlementRecord::getId).collect(Collectors.toList()));
+ }else{
+ settlementDetailEntityWrapper.eq("settlementRecordId", 0);
+ }
+ }else if (state!=null && state == 1){
+ List<SettlementRecord> paymentStatus = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>().eq("paymentStatus", 2));
+ if(paymentStatus.size() > 0){
+ settlementDetailEntityWrapper.in("settlementRecordId", paymentStatus.stream().map(SettlementRecord::getId).collect(Collectors.toList()));
+ }else{
+ settlementDetailEntityWrapper.eq("settlementRecordId", 0);
+ }
}
if (time == 5 && !StringUtils.hasLength(insertTime)){
--
Gitblit v1.7.1