From ddba15cfd1d654dc41de5dfdc587e12d96d84f4f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 04 八月 2025 17:44:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/IOrderTaxiService.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/IOrderTaxiService.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/IOrderTaxiService.java
index 266fc0a..a3812e1 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/IOrderTaxiService.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/IOrderTaxiService.java
@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.taxi.service;
import com.baomidou.mybatisplus.service.IService;
+import com.stylefeng.guns.modular.system.model.vo.UnPayOrderVO;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.*;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
@@ -128,7 +129,7 @@
* @return
* @throws Exception
*/
- ResultUtil payTaxiOrder1(Integer payType, Integer orderId, Integer objectId, Integer objectType, Integer type)throws Exception;
+ ResultUtil payTaxiOrder1(Integer payType, Integer orderId, Integer objectId, Integer objectType, Integer type, String path, String ip)throws Exception;
@@ -296,4 +297,32 @@
* @throws Exception
*/
void payThankYouFeeCallback(Integer orderId, String order_id, Integer payType) throws Exception;
+
+ /**
+ * 获取未支付的出租车订单
+ */
+ List<UnPayOrderVO> getUnpayTaxiOrders(Integer uid);
+
+
+ /**
+ * 添加申诉
+ * @param uid
+ * @param orderId
+ */
+ void addAppeal(Integer uid, Integer orderId,String abnormalIntro, String abnormalImg);
+
+ void promotion(Integer orderId);
+
+ /**
+ * 获取我的行程列表
+ * @param uid
+ * @param pageNum
+ * @param size
+ * @return
+ * @throws Exception
+ */
+ List<Map<String, Object>> queryMyTripList(Integer uid, Integer pageNum, Integer size) throws Exception;
+
+ List<Map<String, Object>> queryMyTripListAll(Integer uid) throws Exception;
+
}
--
Gitblit v1.7.1