From 998bc10d74f370f7f99331d9df53d43311949f53 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 14 八月 2025 19:15:12 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java
index bcc1290..135a4ee 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.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,
+ @Param("abnormal") Integer abnormal,
+ @Param("promotion") Integer promotion,
+ @Param("promotionUser") String promotionUser,
+ @Param("abnormalStatus") Integer abnormalStatus);
+ List<Map<String,Object>> getPrivateCarOrderListExport(
+ @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,
+ @Param("abnormal") Integer abnormal,
+ @Param("promotion") Integer promotion,
+ @Param("promotionUser") String promotionUser,
+ @Param("abnormalStatus") Integer abnormalStatus);
/**
* 根据快车订单ID获取快车订单详情
@@ -47,4 +70,8 @@
List<Map<String,Object>> getSurcharge(@Param("id") Object id,@Param("orderType") Integer orderType);
+
+ List<Map<String, Object>> promotionInfo(@Param("page") Page<Map<String, Object>> page, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("orderNum") String orderNum, @Param("userName") String userName, @Param("name") String name, @Param("driverName") String driverName, @Param("roleType") Integer roleType, @Param("objectId") Integer objectId, @Param("driverId") Integer driverId,@Param("activityId") Integer activityId);
+
+ List<Map<String, Object>> promotionInfoExport(@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("orderNum") String orderNum, @Param("userName") String userName, @Param("name") String name, @Param("driverName") String driverName, @Param("roleType") Integer roleType, @Param("objectId") Integer objectId, @Param("driverId") Integer driverId, @Param("activityId") Integer activityId);
}
--
Gitblit v1.7.1