From 010efba33ae0e00ff06e5a95004e0f624f073ba7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 17 七月 2019 15:34:45 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   14 ++++++++++++++
 1 files changed, 14 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 999e366..dbeead0 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
@@ -269,4 +269,18 @@
 	 */
 	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