From 40bc5a67fe0fa6a01711b7b7a12e38a6272510a8 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 17 七月 2024 15:20:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 54 +++++++++++++++++++++++++++++-------------------------
1 files changed, 29 insertions(+), 25 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 2fcb7a5..1539fac 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
@@ -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;
}
}
@@ -1648,8 +1650,6 @@
.ne("type", 1)
.isNotNull("orderType")
.between("insertTime", start, end));
-
-
break;
case 2:
// 未结算
@@ -1695,9 +1695,13 @@
platformVO.setEndTime(format.format(income.getInsertTime()));
}
platformVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
- String string = income.getMoney().toString();
- BigDecimal bigDecimal1 = new BigDecimal(string);
- platformVO.setMoney(bigDecimal1);
+ if (tOrderPrivateCar.getOrderMoney() != null){
+ String string = tOrderPrivateCar.getOrderMoney().toString();
+ BigDecimal bigDecimal1 = new BigDecimal(string);
+ platformVO.setMoney(bigDecimal1);
+ }else{
+ continue;
+ }
if (tOrderPrivateCar.getPayType() == null){
continue;
}
--
Gitblit v1.7.1