From 5e7b0ed4a154ad067cbcf4aa1a1c7cce32f9864c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 26 四月 2024 18:02:17 +0800
Subject: [PATCH] 唯品会链接解析升级
---
fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
index 0eb4503..38eb0b2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
@@ -8,6 +8,7 @@
import com.yeshi.fanli.dto.order.CommonOrderAddResultDTO;
import com.yeshi.fanli.entity.SystemEnum;
import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.dy.DYOrder;
import com.yeshi.fanli.entity.jd.JDOrder;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.order.ESOrder;
@@ -191,7 +192,7 @@
/**
* 娣诲姞鑻忓畞璁㈠崟
*
- * @param order
+ * @param suningOrderList
* @param uid
* @return
* @throws CommonOrderException List<CommonOrderAddResultDTO> 杩斿洖绫诲瀷
@@ -200,6 +201,20 @@
* @Description:
*/
public List<CommonOrderAddResultDTO> addSuningOrder(List<SuningOrderInfo> suningOrderList, Long uid) throws CommonOrderException;
+
+ /**
+ * 娣诲姞鎶栭煶璁㈠崟
+ *
+ * @param order
+ * @param uid
+ * @return
+ * @throws CommonOrderException List<CommonOrderAddResultDTO> 杩斿洖绫诲瀷
+ * @throws
+ * @Title: addVipShopOrder
+ * @Description:
+ */
+ public List<CommonOrderAddResultDTO> addDYOrder(DYOrder order, Long uid) throws CommonOrderException;
+
/**
@@ -244,7 +259,7 @@
* @param keyType
* @param key
* @param state
- * @param type
+ * @param typeList
* @param orderState
* @param startTime
* @param endTime
@@ -253,11 +268,11 @@
*/
public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state,
- Integer type, Integer orderState, String startTime, String endTime, Integer source,
+ List<Integer> typeList, Integer orderState, String startTime, String endTime, Integer source,
List<Long> listShopId, List<Long> listGoodsId, Date minTime, BigDecimal money, BigDecimal payment, SystemEnum system)
throws CommonOrderException;
- public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
+ public long countQuery(Integer keyType, String key, Integer state, List<Integer> typeList, Integer orderState,
String startTime, String endTime, Integer source,
List<Long> listShopId, List<Long> listGoodsId, Date minTime, BigDecimal money, BigDecimal payment, SystemEnum system) throws CommonOrderException;
@@ -278,7 +293,7 @@
* @param orderNo
* @return
*/
- public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType);
+ public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType, SystemEnum system);
/**
* 鏍规嵁浜ゆ槗鍙疯幏鍙栬鍗曡鎯�
@@ -516,4 +531,15 @@
*/
public List<CommonOrder> listByGoodsIdAndUidAndMinThirdCreateTime(Long goodsId, Long uid, Date minThirdCreateTime);
+
+ /**
+ * 鑾峰彇澶勪簬宸蹭粯娆剧姸鎬佺殑璁㈠崟
+ *
+ * @param sourceType 璁㈠崟鏉ユ簮绫诲瀷
+ * @param minThirdCreateTime 鏈�灏忕涓夋柟鍒涘缓鏃堕棿
+ * @param maxThirdCreateTime 鏈�澶х涓夋柟鍒涘缓鏃堕棿
+ * @return
+ */
+ public List<CommonOrder> listPayStateOrder(Integer sourceType, Date minThirdCreateTime, Date maxThirdCreateTime,int page,int pageSize);
+
}
--
Gitblit v1.8.0