From b43a5e690e89b57482a70352561478e363112ed7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 07 八月 2024 09:35:16 +0800
Subject: [PATCH] 2.0bug修改
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 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 191fed6..c4543d3 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
@@ -316,6 +316,7 @@
PlatformVO platformVO = new PlatformVO();
switch (settlementDetail.getOrderType()){
case 1:
+
// 专车订单
TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
if (tOrderPrivateCar==null){
@@ -352,6 +353,12 @@
unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
platformVO.setEndTime(format.format(settlementRecord.getDay()));
}
+ }else{
+ // 未结算
+ if (state!=null && state!=2){
+ continue;
+ }
+ unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
}
res.add(platformVO);
@@ -394,6 +401,12 @@
unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
platformVO.setEndTime(format.format(settlementRecord.getDay()));
}
+ }else{
+ // 未结算
+ if (state!=null && state!=2){
+ continue;
+ }
+ unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
}
res.add(platformVO);
break;
@@ -1707,6 +1720,12 @@
platformVO.setState(2);
unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
}
+ }else{
+ // 未结算
+ if (state!=null && state!=2){
+ continue;
+ }
+ unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
}
res.add(platformVO);
break;
@@ -1748,6 +1767,12 @@
unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
platformVO.setEndTime(format.format(settlementRecord.getDay()));
}
+ }else{
+ // 未结算
+ if (state!=null && state!=2){
+ continue;
+ }
+ unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
}
res.add(platformVO);
break;
--
Gitblit v1.7.1