From e0a1f37e19bd90c0d10b04cf3ec235d2508c5370 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 12 八月 2024 20:54:12 +0800
Subject: [PATCH] 2.0bug修改
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 17 +++++++++++++++--
1 files changed, 15 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 8ad5472..084c83d 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
@@ -12,6 +12,8 @@
import com.stylefeng.guns.modular.system.vo.PlatformVO;
import com.stylefeng.guns.modular.system.vo.WaterMoneyVO;
import com.stylefeng.guns.modular.system.vo.WaterVO;
+import io.swagger.models.auth.In;
+import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -529,6 +531,9 @@
Wrapper<OrderCancel> orderCancelEntityWrapper = new EntityWrapper<>();
// 用户取消订单记录
List<OrderCancel> orderCancels = new ArrayList<>();
+ List<Integer> integers = new ArrayList<>();
+ integers.add(1);
+ integers.add(2);
if (time == 5 && !StringUtils.hasLength(insertTime)){
// 余额充值wrapper
orderType = new EntityWrapper<TPubTransactionDetails>()
@@ -555,6 +560,10 @@
// 司机手动结算金额
orderType1 = new EntityWrapper<SettlementDetail>()
.in("orderType", Arrays.asList(1, 4));
+ // 用户取消订单费用
+ orderCancelEntityWrapper.eq("state", 2)
+ .eq("userType", 1).in("payType",integers)
+ ;
}else{
orderType = new EntityWrapper<TPubTransactionDetails>()
.eq("orderType", 5)
@@ -587,10 +596,9 @@
// 用户取消订单费用
orderCancelEntityWrapper.eq("state", 2)
.eq("userType", 1)
+ .in("payType",integers)
.between("insertTime", start, end);
}
-
-
if (type != null){
switch (type){
case 1:
@@ -1136,6 +1144,9 @@
Wrapper<OrderCancel> orderCancelEntityWrapper = new EntityWrapper<>();
// 司机手动结算金额
Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
+ List<Integer> integers = new ArrayList<>();
+ integers.add(1);
+ integers.add(2);
if (time == 5 && !StringUtils.hasLength(insertTime)){
// 余额充值wrapper
orderType = new EntityWrapper<TPubTransactionDetails>()
@@ -1165,6 +1176,7 @@
.in("orderType", Arrays.asList(1, 4));
// 用户取消订单费用
orderCancelEntityWrapper.eq("state", 2)
+ .in("payType",integers)
.eq("userType", 1);
}else{
orderType = new EntityWrapper<TPubTransactionDetails>()
@@ -1199,6 +1211,7 @@
// 用户取消订单费用
orderCancelEntityWrapper.eq("state", 2)
.eq("userType", 1)
+ .in("payType",integers)
.between("insertTime", start, end);
}
--
Gitblit v1.7.1