From c399be7463c16b3787b3e591d3006628a11ab858 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 28 四月 2025 17:46:45 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/XianNingChuXing
---
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java
index 247f866..e210482 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java
@@ -12,10 +12,7 @@
import com.stylefeng.guns.modular.system.dao.TUseMoneyMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
-import com.stylefeng.guns.modular.system.util.PayMoneyUtil;
-import com.stylefeng.guns.modular.system.util.PushUtil;
-import com.stylefeng.guns.modular.system.util.ResultUtil;
-import com.stylefeng.guns.modular.system.util.UUIDUtil;
+import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
@@ -266,6 +263,7 @@
}
eq.orderBy("insertTime",false);
List<TransactionDetails> transactionDetails = iTransactionDetailsService.selectList(eq);
+ List<OrderTaxi> orderTaxis = orderTaxiService.selectList(null);
if ((state!=null&&state==1)||(state!=null&&state==2)){
List<HistoryVo> historyVos = new ArrayList<>();
for (TransactionDetails transactionDetail : transactionDetails) {
@@ -281,6 +279,12 @@
}
historyVo.setAddordown(1);
}else {
+ OrderTaxi orderTaxi = orderTaxis.stream().filter(e -> e.getId().equals(transactionDetail.getOrderId())).findFirst().orElse(null);
+ if (orderTaxi!=null){
+ if (orderTaxi.getPayType()!=null && (orderTaxi.getPayType()!=1||orderTaxi.getPayType()!=2)){
+ continue;
+ }
+ }
historyVo.setState("扣除");
historyVo.setAddordown(0);
}
@@ -313,6 +317,12 @@
}
historyVo.setAddordown(1);
}else {
+ OrderTaxi orderTaxi = orderTaxis.stream().filter(e -> e.getId().equals(transactionDetail.getOrderId())).findFirst().orElse(null);
+ if (orderTaxi!=null){
+ if (orderTaxi.getPayType()!=null && (orderTaxi.getPayType()!=1||orderTaxi.getPayType()!=2)){
+ continue;
+ }
+ }
historyVo.setState("扣除");
historyVo.setAddordown(0);
}
--
Gitblit v1.7.1