From 59f70d9b19408d36f40ee0f418bf98232c40fb33 Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 09:41:42 +0800
Subject: [PATCH] 代码调整

---
 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderTaxiMapper.java |   65 +++++++++++++++++++++++++++-----
 1 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderTaxiMapper.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderTaxiMapper.java
index d79254e..1720dda 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderTaxiMapper.java
+++ b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderTaxiMapper.java
@@ -11,20 +11,56 @@
 public interface OrderTaxiMapper extends BaseMapper<OrderTaxi> {
 
 
+    /**
+     * 获取数据
+     * @param start
+     * @param end
+     * @return
+     * @throws Exception
+     */
+    List<OrderTaxi> query(@Param("start") Date start, @Param("end") Date end) throws Exception;
+
 
     /**
-     * 获取订单列表
-     * @param search
-     * @param orderSource
-     * @param state
-     * @param companyId
+     * 获取用户的订单列表
+     * @param uid
      * @param pageNum
      * @param size
      * @return
      */
-    List<Map<String, Object>> queryOrderList(@Param("search") String search, @Param("orderSource") List<String> orderSource,
-                                             @Param("state") List<String> state, @Param("companyId") Integer companyId,
-                                             @Param("pageNum") Integer pageNum, @Param("size") Integer size);
+    List<Map<String, Object>> queryMyOrderList(@Param("uid") Integer uid, @Param("pageNum") Integer pageNum,
+                                               @Param("size") Integer size);
+
+
+    /**
+     * 获取历史消费记录
+     * @param uid
+     * @return
+     */
+    List<Map<String, Object>> queryMyTravelRecord(@Param("uid") Integer uid);
+
+
+    /**
+     * 获取红包使用记录
+     * @param uid
+     * @return
+     */
+    List<Map<String, Object>> queryRedEnvelope(@Param("uid") Integer uid);
+
+
+    /**
+     * 获取用户单发票页面的订单列表
+     * @param type          开票状态(1=未开票,2=已开票)
+     * @param startTime     订单开始时间
+     * @param endTime       订单结束时间
+     * @param startMoney    订单金额范围
+     * @param endMoney
+     * @param uid
+     * @return
+     */
+    List<Map<String, Object>> queryInvoiceOrder(@Param("type") Integer type, @Param("startTime") Date startTime,
+                                                @Param("endTime") Date endTime, @Param("startMoney") Double startMoney,
+                                                @Param("endMoney") Double endMoney, @Param("uid") Integer uid);
 
 
     /**
@@ -38,10 +74,19 @@
     /**
      * 获取订单数据
      * @param uid
+     * @param state
+     * @return
+     */
+    List<OrderTaxi> queryByState(@Param("uid") Integer uid, @Param("state") Integer... state);
+
+
+    /**
+     * 获取订单数据
+     * @param uid
      * @param orderType     1=即时单,2=预约单
      * @param state
      * @return
      */
-    List<OrderTaxi> queryByState(@Param("uid") Integer uid, @Param("orderType") Integer orderType,
-                                  @Param("type") Integer type, @Param("state") Integer...state);
+    List<OrderTaxi> queryByState_(@Param("uid") Integer uid, @Param("orderType") Integer orderType,
+                                  @Param("type") Integer type, @Param("state") Integer... state);
 }

--
Gitblit v1.7.1