From 5797fc7e8267d634ee64fd27cdea2a834091681e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 15 一月 2019 11:10:24 +0800
Subject: [PATCH] Merge branch 'master' into dev-msg

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   21 +++++++++++++++++++++
 1 files changed, 21 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 43c29a1..474cbb0 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
@@ -174,4 +174,25 @@
 	public long countQueryByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo, String startTime,
 			String endTime, Integer dateType) throws CommonOrderException;
 
+	/**
+	 * 鏌ヨ鎵�鏈夌敤鎴疯鍗� 
+	 * @param start
+	 * @param count
+	 * @param keyType
+	 * @param key
+	 * @param state
+	 * @param type
+	 * @param orderState
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 * @throws CommonOrderException
+	 */
+	
+	public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state, Integer type,
+			Integer orderState, String startTime, String endTime) throws CommonOrderException;
+
+	public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState, String startTime,
+			String endTime) throws CommonOrderException;
+
 }

--
Gitblit v1.8.0