From a1d7b7b122f92f7de47f7f35212f029f01e3e71a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 25 七月 2024 18:01:13 +0800
Subject: [PATCH] 2.0bug修改
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 4ef08d7..191fed6 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
@@ -692,8 +692,6 @@
break;
}
-
-
// 司机提现
for (TPubWithdrawal tPubWithdrawal : driver) {
if(payType!=null && payType == 1){
@@ -721,7 +719,9 @@
break;
}
WaterVO waterVO = new WaterVO();
- waterVO.setInsertTime(format.format(tPubWithdrawal.getHandleTime()));
+ if (tPubWithdrawal.getHandleTime()!=null){
+ waterVO.setInsertTime(format.format(tPubWithdrawal.getHandleTime()));
+ }
waterVO.setCode(tPubWithdrawal.getCode());
TUser user2 = appUserService.selectById(tPubWithdrawal.getUserId());
if (user2!=null){
@@ -741,6 +741,10 @@
Integer orderId = tPubTransactionDetail.getOrderId();
PaymentRecord paymentRecord = paymentRecordService.selectById(orderId);
if (paymentRecord!=null){
+ if (paymentRecord.getState() == 1){
+ // 临时数据
+ continue;
+ }
waterVO.setInsertTime(format.format(paymentRecord.getInsertTime()));
waterVO.setCode(paymentRecord.getCode());
if (paymentRecord.getPayType()!=null){
@@ -911,6 +915,8 @@
break;
}
}
+ // 过滤掉res中insertTime未空的数据
+ res.removeIf(waterVO -> waterVO.getInsertTime() == null);
Collections.sort(res, Comparator.comparing(WaterVO::getInsertTime).reversed());
WaterMoneyVO waterMoneyVO = new WaterMoneyVO();
BigDecimal add = userRecharge.add(userConsume).add(balance).subtract(driverWithdrawal).subtract(userWithdrawal);
@@ -1256,6 +1262,10 @@
Integer orderId = tPubTransactionDetail.getOrderId();
PaymentRecord paymentRecord = paymentRecordService.selectById(orderId);
if (paymentRecord!=null){
+ if (paymentRecord.getState() == 1){
+ // 临时数据
+ continue;
+ }
waterVO.setInsertTime(format.format(paymentRecord.getInsertTime()));
waterVO.setCode(paymentRecord.getCode());
if (paymentRecord.getPayType()!=null){
--
Gitblit v1.7.1