From 75a2623173bcc4a235aa1f99f7ef28519186160b Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 11:24:25 +0800
Subject: [PATCH] 代码调整
---
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java | 73 +++++++++---------------------------
1 files changed, 19 insertions(+), 54 deletions(-)
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java
index 8cde9ee..7f15098 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java
@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import com.stylefeng.guns.modular.system.util.ResultUtil;
-import com.stylefeng.guns.modular.system.warpper.*;
+import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
+import com.stylefeng.guns.modular.system.warpper.EndPushWarpper;
+import com.stylefeng.guns.modular.system.warpper.OrderServerWarpper;
+import com.stylefeng.guns.modular.system.warpper.SmartScreenOrderVo;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
-import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
@@ -30,11 +32,13 @@
* @param endAddress 终点详细地址
* @param name 乘客姓名
* @param phone 乘客电话
+ * @param deviceCode 设备号
* @return
* @throws Exception
*/
ResultUtil<BaseWarpper> saveOrderPrivateCar(Integer serverCarModelId, Date travelTime, Integer reservation, Integer instead, String placementLon, String placementLat,
- String startLon, String startLat, String startAddress, String endLon, String endLat, String endAddress, String name, String phone, Integer orderSource, Integer driverId, Integer type, Integer uid,Integer peopleNum,Integer rideType) throws Exception;
+ String startLon, String startLat, String startAddress, String endLon, String endLat, String endAddress, String name, String phone,
+ Integer orderSource, Integer driverId, Integer type, Integer uid, String deviceCode) throws Exception;
/**
@@ -95,15 +99,6 @@
Map<String, Object> queryBalance(Integer orderId, Integer uid) throws Exception;
- /**
- * 获取用户余额和优惠数据
- * @param uid
- * @return
- * @throws Exception
- */
- PreferentialDataVo queryBalance1(Integer orderId, Integer uid) throws Exception;
-
-
/**
* 获取优惠券列表
@@ -112,18 +107,6 @@
* @throws Exception
*/
List<Map<String, Object>> queryCoupon(Integer orderId, Integer uid, Integer pageNum, Integer size) throws Exception;
-
-
- /**
- * 获取优惠券和打车卡列表
- * @param orderId
- * @param uid
- * @param pageNum
- * @param size
- * @return
- * @throws Exception
- */
- List<CouponsListVo> queryCouponList(Integer orderId, Integer uid, Integer pageNum, Integer size) throws Exception;
@@ -136,16 +119,6 @@
* @throws Exception
*/
ResultUtil payPrivateCarOrder(Integer payType, Integer orderId, Integer couponId, Integer type)throws Exception;
-
-
- /**
- * 订单完成支付订单操作
- * @param payType
- * @param orderId
- * @return
- * @throws Exception
- */
- ResultUtil payPrivateCarOrder1(Integer payType, Integer orderId, Integer objectId, Integer objectType, Integer type)throws Exception;
@@ -282,32 +255,24 @@
/**
- * 支付感谢费
- * @param uid
- * @param orderId
- * @param money
- * @param payType
+ * 智慧屏一键叫车
+ * @param phone
+ * @param placementLon
+ * @param placementLat
+ * @param startLon
+ * @param startLat
+ * @param startAddress
* @return
* @throws Exception
*/
- ResultUtil payThankYouFee(Integer uid, Integer orderId, Double money, Integer payType, Integer type) throws Exception;
+ ResultUtil<BaseWarpper> directCallCar(String phone, String placementLon, String placementLat, String startLon, String startLat, String startAddress, String deviceCode) throws Exception;
/**
- * 感谢费支付回调处理
- * @param orderId
- * @param order_id
+ * 获取智慧屏待上车订单列表
+ * @param deviceCode
+ * @return
* @throws Exception
*/
- void payThankYouFeeCallback(Integer orderId, String order_id, Integer payType) throws Exception;
-
- /**
- * 获取订单详情页（服务中的页面）
- * @param orderId
- * @return
- */
- List<Map<String, Object>> queryOrderInfo2(@Param("orderId") Integer orderId,
- @Param("state") Integer state,
- @Param("lon") String lon,
- @Param("lat") String lat);
+ List<SmartScreenOrderVo> querySmartScreenOrder(String deviceCode, String lonLat) throws Exception;
}
--
Gitblit v1.7.1