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/dao/mybatis/taobao/TaoBaoOrderMapper.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoOrderMapper.java
index 2416043..9fe666a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoOrderMapper.java
@@ -7,6 +7,7 @@
 
 import com.yeshi.fanli.entity.admin.ReslutOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
+import com.yeshi.fanli.vo.order.TaoBaoOrderVO;
 
 public interface TaoBaoOrderMapper {
 
@@ -79,5 +80,14 @@
 	List<Map<String, Object>> countOrderNumber( @Param("dateType") Integer dateType, @Param("year") String year, 
 			@Param("startTime")String startTime, @Param("endTime")String endTime);
 	
+
+	List<TaoBaoOrderVO> listQuery(@Param("start")long start, @Param("count") int count, 
+			@Param("keyType")Integer keyType, @Param("key") String key,
+			@Param("startTime") String startTime, @Param("endTime") String endTime,
+			@Param("state")Integer state);
+	
+	long countQuery(@Param("keyType")Integer keyType, @Param("key") String key,
+			@Param("startTime") String startTime,@Param("endTime") String endTime,
+			@Param("state")Integer state);
 	
 }
\ No newline at end of file

--
Gitblit v1.8.0