From 736ab0090700c75af37b8a3456b01609e4e2d329 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 17 七月 2024 11:09:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java | 102 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 98 insertions(+), 4 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 9d87fc1..e9457ac 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,10 @@
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 org.apache.ibatis.annotations.Param;
+import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -66,8 +68,32 @@
*/
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 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 +103,7 @@
* @return
* @throws Exception
*/
- ResultUtil payLogisticsOrder(Integer payType, Integer bankCardId, Integer orderId,Integer couponId, Integer type, Integer language)throws Exception;
+ ResultUtil payLogisticsOrder(Integer payType, Integer bankCardId, Integer orderId,Integer couponId, Integer redDeduction, Integer type, Integer language)throws Exception;
/**
@@ -166,7 +192,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;
/**
@@ -211,4 +237,72 @@
* @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;
}
--
Gitblit v1.7.1