From a290d3c875f1ff6549010703ca95b654d022977d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 17 七月 2024 09:47:45 +0800
Subject: [PATCH] 2.0统计bug修改
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 d85374d..2fcb7a5 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
@@ -325,18 +325,18 @@
if (state!=null){
if (state == 1){
// 查询已结算的
- if (settlementRecord.getPaymentStatus() == 1){
+ if (settlementRecord!=null &&settlementRecord.getPaymentStatus() == 1){
continue;
}
}
if (state == 2){
// 查询未结算的
- if (settlementRecord.getPaymentStatus() == 2){
+ if (settlementRecord!=null &&settlementRecord.getPaymentStatus() == 2){
continue;
}
}
}
- if (settlementRecord.getPaymentStatus() == 2){
+ if (settlementRecord!=null && settlementRecord.getPaymentStatus() == 2){
// 已结算
platformVO.setState(1);
balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
@@ -374,18 +374,18 @@
if (state!=null){
if (state == 1){
// 查询已结算的
- if (settlementRecord1.getPaymentStatus() == 1){
+ if (settlementRecord1!=null && settlementRecord1.getPaymentStatus() == 1){
continue;
}
}
if (state == 2){
// 查询未结算的
- if (settlementRecord1.getPaymentStatus() == 2){
+ if (settlementRecord1!=null && settlementRecord1.getPaymentStatus() == 2){
continue;
}
}
}
- if (settlementRecord1.getPaymentStatus() == 2){
+ if (settlementRecord1!=null && settlementRecord1.getPaymentStatus() == 2){
// 已结算
platformVO.setState(1);
balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
@@ -1795,18 +1795,18 @@
if (state!=null){
if (state == 1){
// 查询已结算的
- if (settlementRecord.getPaymentStatus() == 1){
+ if (settlementRecord!=null&&settlementRecord.getPaymentStatus() == 1){
continue;
}
}
if (state == 2){
// 查询未结算的
- if (settlementRecord.getPaymentStatus() == 2){
+ if (settlementRecord!=null&&settlementRecord.getPaymentStatus() == 2){
continue;
}
}
}
- if (settlementRecord.getPaymentStatus() == 2){
+ if (settlementRecord!=null&&settlementRecord.getPaymentStatus() == 2){
// 已结算
platformVO.setState(1);
balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
--
Gitblit v1.7.1