From 5fd988c9e31b9e3ad40c509c6562c8ff61b1198f Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期五, 01 八月 2025 11:21:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java
index 7477f5f..7b1da0c 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java
@@ -36,7 +36,30 @@
@Param("serverCarModelId") Integer serverCarModelId,
@Param("driver") String driver,
@Param("state") Integer state,
- @Param("rideType") Integer rideType);
+ @Param("rideType") Integer rideType,
+ Integer abnormal,
+ Integer promotion,
+ String promotionUser,
+ Integer abnormalStatus);
+ List<Map<String,Object>> getPrivateCarOrderListExport(@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("state") Integer state,
+ @Param("rideType") Integer rideType,
+ Integer abnormal,
+ Integer promotion,
+ String promotionUser,
+ Integer abnormalStatus);
/**
* 根据快车订单ID获取快车订单详情
@@ -47,4 +70,9 @@
List<Map<String,Object>> getSurcharge(Object id,Integer orderType);
+
+ List<Map<String, Object>> promotionInfo(Page<Map<String, Object>> page, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId);
+
+
+ List<Map<String, Object>> promotionInfoExport(Object o, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId);
}
--
Gitblit v1.7.1