From 4ef5e1e6b073508964dfb378053d178de63860bb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 28 八月 2025 16:10:14 +0800
Subject: [PATCH] 8.22后台

---
 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 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 e210482..499c688 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
@@ -258,8 +258,9 @@
                 eq.eq("state",1);
 
             }
+            eq.ne("orderType",6);
             if (state!=null&&state==2){
-                eq.eq("state",2);
+                eq.ne("state",2);
             }
             eq.orderBy("insertTime",false);
             List<TransactionDetails> transactionDetails = iTransactionDetailsService.selectList(eq);
@@ -272,6 +273,12 @@
                         switch (transactionDetail.getOrderType()){
                             case 2:
                                 historyVo.setState("订单收入");
+                                break;
+                            case 3:
+                                historyVo.setState("城际出行");
+                                break;
+                            case 4:
+                                historyVo.setState("同城小件物流");
                                 break;
                             default:
                                 historyVo.setState("充值");
@@ -311,6 +318,12 @@
                         case 2:
                             historyVo.setState("订单收入");
                             break;
+                        case 3:
+                            historyVo.setState("城际出行");
+                            break;
+                        case 4:
+                            historyVo.setState("同城小件物流");
+                            break;
                         default:
                             historyVo.setState("充值");
                             break;

--
Gitblit v1.7.1