From a8c566a3b274058fe31feaf8e980b2334b9bf83a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 22 七月 2019 14:22:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 56 insertions(+), 1 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 0ad7a3d..513d188 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
@@ -5,7 +5,11 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.entity.jd.JDOrder;
 import com.yeshi.fanli.entity.order.CommonOrder;
+import com.yeshi.fanli.entity.pdd.PDDOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
 import com.yeshi.fanli.exception.order.CommonOrderException;
 import com.yeshi.fanli.vo.order.CommonOrderVO;
@@ -135,13 +139,34 @@
 	public List<CommonOrder> listBySourceTypeAndOrderId(int sourceType, String orderId);
 
 	/**
-	 * 缂撳瓨鏅�氳鍗�
+	 * 缂撳瓨娣樺疂绫绘櫘閫氳鍗�
 	 * 
 	 * @param taoBaoOrder
 	 * @param uid
 	 * @return
+	 * @throws CommonOrderException
 	 */
 	public List<CommonOrder> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrder, Long uid) throws CommonOrderException;
+
+	/**
+	 * 缂撳瓨鎷煎澶氱被鏅�氳鍗�
+	 * 
+	 * @param pddOrderList
+	 * @param uid
+	 * @return
+	 * @throws CommonOrderException
+	 */
+	public List<CommonOrder> addPDDOrder(List<PDDOrder> pddOrderList, Long uid) throws CommonOrderException;
+
+	/**
+	 * 缂撳瓨浜笢鏅�氳鍗�
+	 * 
+	 * @param jdOrderList
+	 * @param uid
+	 * @return
+	 * @throws CommonOrderException
+	 */
+	public List<CommonOrder> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException;
 
 	/**
 	 * 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬侊紝缁撶畻鏃堕棿缁熻璁㈠崟鏁伴噺
@@ -249,4 +274,34 @@
 	 */
 	public CommonOrder selectBySourceTypeAndTradeId(int sourceType, String tradeId);
 
+	/**
+	 * 鍒犻櫎閿欒璁㈠崟
+	 * 
+	 * @param coId
+	 */
+	public void deleteErrorCommonOrder(Long coId);
+
+	/**
+	 * 鏍规嵁璁㈠崟绫诲瀷涓庝氦鏄揑D鏌ヨ
+	 * 
+	 * @param sourceType
+	 * @param tradeId
+	 * @return
+	 */
+	public List<CommonOrder> listBySourceTypeAndTradeId(int sourceType, String tradeId);
+
+	/**
+	 * 鏍规嵁鏉′欢鏌ヨ璁㈠崟
+	 * 
+	 * @param sourceType
+	 * @param state
+	 * @param minTime
+	 * @param maxTime
+	 * @param page
+	 * @param pageSize
+	 * @return
+	 */
+	List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(int sourceType, Integer state, Long minTime,
+			Long maxTime, int page, int pageSize);
+
 }

--
Gitblit v1.8.0