From 96a415a0de73542ddb5da7eaa61e4d7e55065ae3 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 12 一月 2019 15:30:55 +0800
Subject: [PATCH] Merge branch 'div1'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoOrderService.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoOrderService.java
index f5b8035..14048dc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoOrderService.java
@@ -1,10 +1,10 @@
 package com.yeshi.fanli.service.inter.taobao;
 
 import java.util.List;
-import java.util.Map;
 
 import com.yeshi.fanli.entity.admin.ReslutOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
+import com.yeshi.fanli.vo.order.TaoBaoOrderVO;
 
 /**
  * 娣樺疂璁㈠崟鏈嶅姟
@@ -74,4 +74,22 @@
 	 */
 	public List<TaoBaoOrder> getStateByOrderIdAndPayment(String orderId, String payment) throws Exception;
 
+	
+	/**
+	 * 鍚庣鏌ヨ鍟嗗搧鍒楄〃
+	 * @param start
+	 * @param count
+	 * @param keyType
+	 * @param key
+	 * @param startTime
+	 * @param endTime
+	 * @param state
+	 * @return
+	 * @throws Exception
+	 */
+	public List<TaoBaoOrderVO> listQuery(int start, int count, Integer keyType, String key, String startTime, String endTime,
+			Integer state) throws Exception;
+
+	public long countQuery(Integer keyType, String key, String startTime, String endTime, Integer state) throws Exception;
+
 }

--
Gitblit v1.8.0