From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 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 fd39e4c..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,6 +5,8 @@
 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;
@@ -272,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