From abd111492d09f50288ed1429da0d5bad3e16c6e7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 17 七月 2024 13:48:26 +0800
Subject: [PATCH] 2.0bug修改
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 60 +++++++++++++++++++++++++++++++-----------------------------
1 files changed, 31 insertions(+), 29 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..62d21aa 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()));
@@ -535,6 +535,7 @@
.ne("type", 1)
.isNotNull("orderType")
.between("insertTime", start, end));
+
break;
case 4:
if(payType!=null && payType == 2){
@@ -603,7 +604,7 @@
switch (tOrderPrivateCar1.getPayType()){
case 1:
if (payType!=null){
- if (payType == 1){
+ if (payType != 1){
continue;
}
}
@@ -611,7 +612,7 @@
break;
case 2:
if (payType!=null){
- if (payType == 2){
+ if (payType != 2){
continue;
}
}
@@ -655,7 +656,7 @@
switch (tOrderLogistics.getPayType()){
case 1:
if (payType!=null){
- if (payType == 1){
+ if (payType != 1){
continue;
}
}
@@ -663,7 +664,7 @@
break;
case 2:
if (payType!=null){
- if (payType == 2){
+ if (payType != 2){
continue;
}
}
@@ -741,7 +742,7 @@
switch (paymentRecord.getPayType()){
case 1:
if (payType!=null){
- if (payType == 1){
+ if (payType != 1){
continue;
}
}
@@ -749,7 +750,7 @@
break;
case 2:
if (payType!=null){
- if (payType == 2){
+ if (payType != 2){
continue;
}
}
@@ -812,7 +813,7 @@
switch (tOrderPrivateCar.getPayType()){
case 1:
if (payType!=null){
- if (payType == 1){
+ if (payType != 1){
continue;
}
}
@@ -820,7 +821,7 @@
break;
case 2:
if (payType!=null){
- if (payType == 2){
+ if (payType != 2){
continue;
}
}
@@ -862,7 +863,7 @@
switch (tOrderLogistics.getPayType()){
case 1:
if (payType!=null){
- if (payType == 1){
+ if (payType != 1){
continue;
}
}
@@ -870,7 +871,7 @@
break;
case 2:
if (payType!=null){
- if (payType == 2){
+ if (payType != 2){
continue;
}
}
@@ -1100,6 +1101,7 @@
// .between("insertTime", start, end);
// 用户订单wrapper
Wrapper<TPubTransactionDetails> between1 = new EntityWrapper<TPubTransactionDetails>()
+ .eq("userType",1)
.in("orderType", Arrays.asList(1, 4))
.between("insertTime", start, end);
@@ -1188,7 +1190,7 @@
switch (tOrderPrivateCar1.getPayType()){
case 1:
if (payType!=null){
- if (payType == 1){
+ if (payType != 1){
continue;
}
}
@@ -1196,7 +1198,7 @@
break;
case 2:
if (payType!=null){
- if (payType == 2){
+ if (payType != 2){
continue;
}
}
@@ -1240,7 +1242,7 @@
switch (tOrderLogistics.getPayType()){
case 1:
if (payType!=null){
- if (payType == 1){
+ if (payType != 1){
continue;
}
}
@@ -1248,7 +1250,7 @@
break;
case 2:
if (payType!=null){
- if (payType == 2){
+ if (payType != 2){
continue;
}
}
@@ -1326,7 +1328,7 @@
switch (paymentRecord.getPayType()){
case 1:
if (payType!=null){
- if (payType == 1){
+ if (payType != 1){
continue;
}
}
@@ -1334,7 +1336,7 @@
break;
case 2:
if (payType!=null){
- if (payType == 2){
+ if (payType != 2){
continue;
}
}
@@ -1397,7 +1399,7 @@
switch (tOrderPrivateCar.getPayType()){
case 1:
if (payType!=null){
- if (payType == 1){
+ if (payType != 1){
continue;
}
}
@@ -1405,7 +1407,7 @@
break;
case 2:
if (payType!=null){
- if (payType == 2){
+ if (payType != 2){
continue;
}
}
@@ -1447,7 +1449,7 @@
switch (tOrderLogistics.getPayType()){
case 1:
if (payType!=null){
- if (payType == 1){
+ if (payType != 1){
continue;
}
}
@@ -1455,7 +1457,7 @@
break;
case 2:
if (payType!=null){
- if (payType == 2){
+ if (payType != 2){
continue;
}
}
@@ -1795,18 +1797,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