From 0fc5865ab5f1df62cb948fbb97c2207b5bd855f9 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期四, 31 七月 2025 21:26:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTaxiService.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTaxiService.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTaxiService.java
index ac0eed8..1abd81a 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTaxiService.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTaxiService.java
@@ -36,7 +36,29 @@
@Param("passengers") String passengers,
@Param("passengersPhone") String passengersPhone,
@Param("driver") String driver,
- @Param("state") Integer state);
+ @Param("state") Integer state,
+ Integer abnormal,
+ Integer promotion,
+ String promotionUser,
+ Integer abnormalStatus);
+
+ List<Map<String,Object>> getTaxiOrderListExport(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("orderNum") String orderNum,
+ @Param("orderSource") Integer orderSource,
+ @Param("userName") String userName,
+ @Param("userPhone") String userPhone,
+ @Param("passengers") String passengers,
+ @Param("passengersPhone") String passengersPhone,
+ @Param("driver") String driver,
+ @Param("state") Integer state,
+ Integer abnormal,
+ Integer promotion,
+ String promotionUser,
+ Integer abnormalStatus);
/**
* 根据出租车订单ID获取出租车订单详情
--
Gitblit v1.7.1