From 2ab5f166d0fad4b1a860fde3bab1adb46d062c3f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 23 七月 2025 21:18:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderCrossCityService.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderCrossCityService.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderCrossCityService.java
index 668551f..c1c7129 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderCrossCityService.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderCrossCityService.java
@@ -36,7 +36,30 @@
@Param("serverCarModelId") Integer serverCarModelId,
@Param("driver") String driver,
@Param("lineId") Integer lineId,
- @Param("state") Integer state);
+ @Param("state") Integer state,
+ Integer abnormal,
+ Integer promotion,
+ String promotionUser,
+ Integer abnormalStatus);
+ List<Map<String,Object>> getCrossCityOrderListExport(@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("serverCarModelId") Integer serverCarModelId,
+ @Param("driver") String driver,
+ @Param("lineId") Integer lineId,
+ @Param("state") Integer state,
+ Integer abnormal,
+ Integer promotion,
+ String promotionUser,
+ Integer abnormalStatus);
/**
* 根据跨城出行订单ID获取跨城出行订单详情
--
Gitblit v1.7.1