From c6edd699a33e9eae3b328ecb974f464c46b7f782 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 15 十一月 2024 09:52:28 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java | 147 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 130 insertions(+), 17 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
index 675c875..659ed8a 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
@@ -4,8 +4,12 @@
import com.stylefeng.guns.modular.smallLogistics.model.OrderLogistics;
import com.stylefeng.guns.modular.system.model.Region;
import com.stylefeng.guns.modular.system.util.ResultUtil;
+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 org.apache.ibatis.annotations.Param;
+import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -30,7 +34,7 @@
* @return
* @throws Exception
*/
- ResultUtil queryLogisticsUnitPrice(Integer type, String startLonLat, String endAddress, Integer uid) throws Exception;
+ ResultUtil queryLogisticsUnitPrice(Integer type, String startLonLat, String endLonLat, String endAddress, Integer uid, Integer language) throws Exception;
/**
@@ -41,7 +45,7 @@
* @return
* @throws Exception
*/
- ResultUtil queryPayMoney(Integer number, Integer type, String startLonLat, String endAddress) throws Exception;
+ ResultUtil queryPayMoney(Integer uid, Integer number, Integer type, String startLonLat, String endLonLat, String endAddress, Integer language) throws Exception;
/**
@@ -65,9 +69,33 @@
* @throws Exception
*/
ResultUtil smallLogistics(Integer type, Integer cargoType, Integer cargoNumber, String remark, String placementLon, String placementLat, String startLon, String startLat, String startAddress,
- String recipient, String recipientPhone, String endAddress, Integer urgent, Double tipMoney, Date travelTime, Integer orderSource, Integer uid) throws Exception;
-
-
+ String recipient, String recipientPhone, String endLonLat, String endAddress, Integer urgent, Double tipMoney, Date travelTime, Integer orderSource, Integer uid, Integer language) throws Exception;
+
+
+ /**
+ * 包裹下单2.0
+ * @param remark
+ * @param placementLon
+ * @param placementLat
+ * @param startLon
+ * @param startLat
+ * @param startAddress
+ * @param recipient
+ * @param recipientPhone
+ * @param endLon
+ * @param endLat
+ * @param endAddress
+ * @param serverCarModelId
+ * @param driverId
+ * @param orderSource
+ * @param language
+ * @param uid
+ * @return
+ */
+ ResultUtil placeOrderPackage(String remark, String placementLon, String placementLat, String startLon, String startLat, String startAddress,
+ String recipient, String recipientPhone, String endLon, String endLat, String endAddress, Integer serverCarModelId,
+ Integer driverId, Integer orderSource, Integer uid, Integer language) throws Exception;
+
/**
@@ -77,7 +105,7 @@
* @return
* @throws Exception
*/
- ResultUtil payLogisticsOrder(Integer payType, Integer orderId, Integer type)throws Exception;
+ ResultUtil payLogisticsOrder(Integer payType, Integer bankCardId, Integer orderId,Integer couponId, Integer redDeduction, Integer type, Integer language)throws Exception;
/**
@@ -87,7 +115,7 @@
* @return
* @throws Exception
*/
- ResultUtil payLogisticsOrder_(Integer payType, Integer orderId, Integer type)throws Exception;
+ ResultUtil payLogisticsOrder_(Integer payType, Integer bankCardId, Integer orderId, Integer type, Integer language)throws Exception;
@@ -95,10 +123,9 @@
* 支付完成后的订单处理
* @param id 订单=id
* @param order_id 工行支付单号
- * @param type 1=微信，2=支付宝
* @throws Exception
*/
- void payOrderLogisticsCallback(Integer id, String order_id, Integer type) throws Exception;
+ void payOrderLogisticsCallback(Integer id, String order_id, Integer language) throws Exception;
@@ -106,10 +133,9 @@
* 差价支付完成后的回调处理
* @param id 订单=id
* @param order_id 工行支付单号
- * @param type 1=微信，2=支付宝
* @throws Exception
*/
- void payOrderLogisticsSpreadCallback(Integer id, String order_id, Integer type) throws Exception;
+ void payOrderLogisticsSpreadCallback(Integer id, String order_id, Integer language) throws Exception;
@@ -131,7 +157,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryMyOrderList(Integer uid, Integer pageNum, Integer size) throws Exception;
+ List<Map<String, Object>> queryMyOrderList(Integer uid, Integer pageNum, Integer size, Integer language) throws Exception;
@@ -140,7 +166,7 @@
* @param uid
* @return
*/
- List<Map<String, Object>> queryMyTravelRecord(Integer uid);
+ List<Map<String, Object>> queryMyTravelRecord(Integer language, Integer uid);
@@ -155,7 +181,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryInvoiceOrder(Integer type, Date startTime, Date endTime, Double startMoney,
+ List<Map<String, Object>> queryInvoiceOrder(Integer language, Integer type, Date startTime, Date endTime, Double startMoney,
Double endMoney, Integer uid, Integer orderType) throws Exception;
@@ -168,7 +194,7 @@
* @param uid
* @throws Exception
*/
- ResultUtil addCancle(Integer id, String reason, String remark, Integer uid, Integer language) throws Exception;
+ ResultUtil addCancle(Integer id, String reason, String remark, Integer uid, Double lon, Double lat, String address, Integer language) throws Exception;
/**
@@ -203,7 +229,7 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryOrderInfo(Integer orderId) throws Exception;
+ Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception;
/**
@@ -212,5 +238,92 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryCoupon(Integer orderId, Integer uid, Integer pageNum, Integer size) throws Exception;
+ List<Map<String, Object>> queryCoupon(Integer language, Integer orderId, Integer uid, Integer pageNum, Integer size) throws Exception;
+
+
+ /**
+ * 获取取消订单需要支付的金额
+ * @param id
+ * @return
+ * @throws Exception
+ */
+ ResultUtil<BaseWarpper> queryCancleAmount(Integer id, Integer language) throws Exception;
+
+ /**
+ * 删除服务中推送定时任务
+ * @param orderId
+ */
+ void deleteTask(Integer orderId);
+
+
+ /**
+ * 取消订单操作
+ * @param id
+ * @return
+ * @throws Exception
+ */
+ ResultUtil cancleOrderPrivateCar(Integer id, Integer payType, Integer bankCardId, Integer cancleId, Integer type, Integer language) throws Exception;
+
+
+ /**
+ * 取消订单支付后的处理
+ * @param id 订单=id
+ * @param order_id 工行支付单号
+ * @throws Exception
+ */
+ void payCancelOrderPrivateCar(Integer id, String order_id, Integer language) throws Exception;
+
+
+ /**
+ * 修改目的地
+ * @param orderId
+ * @param endLon
+ * @param endLat
+ * @param endAddress
+ */
+ void updateEndAddress(Integer orderId, String endLon, String endLat, String endAddress);
+
+ /**
+ * 评论成功后获取红包金额
+ * @param orderId
+ * @return
+ * @throws Exception
+ */
+ ResultUtil<BaseWarpper> queryRedMoney(Integer orderId) throws Exception;
+
+ /**
+ * 分享成功后添加红包
+ * @param orderId
+ * @return
+ * @throws Exception
+ */
+ ResultUtil shareRedEnvelope(Integer orderId, Integer language) throws Exception;
+
+
+ /**
+ * 获取红包使用记录
+ * @param uid
+ * @return
+ * @throws Exception
+ */
+ List<Map<String, Object>> queryRedEnvelope(Integer language, Integer uid) throws Exception;
+
+
+
+ /**
+ * 获取服务中的订单数据
+ * @param uid
+ * @return
+ * @throws Exception
+ */
+ OrderServerWarpper queryOrderServer(Integer orderId, Integer uid) throws Exception;
+
+
+ /**
+ * 获取下单推送完后没有司机下单的提醒
+ * @param uid
+ * @return
+ * @throws Exception
+ */
+ EndPushWarpper queryEndPush(Integer uid) throws Exception;
}
--
Gitblit v1.7.1