From 49e88798dcea0164f77c59f0be9eefdf67a3d228 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 17 七月 2024 15:03:10 +0800
Subject: [PATCH] 2.0bug修改
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 62d21aa..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
@@ -1650,8 +1650,6 @@
.ne("type", 1)
.isNotNull("orderType")
.between("insertTime", start, end));
-
-
break;
case 2:
// 未结算
@@ -1697,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