From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/pdd/PDDOrderMapper.java |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/pdd/PDDOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/pdd/PDDOrderMapper.java
index 75198df..5554525 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/pdd/PDDOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/pdd/PDDOrderMapper.java
@@ -17,7 +17,7 @@
 	 * @return
 	 */
 	PDDOrder selectByOrderSN(String orderSn);
-
+	
 	/**
 	 * 鏁伴噺缁熻
 	 * 
@@ -30,6 +30,18 @@
 	List<ChartTDO> countOrderNumber(@Param("dateType") Integer dateType, @Param("year") String year,
 			@Param("startTime") String startTime, @Param("endTime") String endTime);
 
+
+	/**
+	 * 鏁伴噺缁熻
+	 * 
+	 * @param dateType
+	 * @param year
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 */
+	Long countOrderByDay(@Param("preDay") String preDay);
+	
 	/**
 	 * 鏍规嵁鐘舵�佹煡璇㈡暟鎹�
 	 * 
@@ -47,4 +59,16 @@
 	 * @return
 	 */
 	Long countByStatus(@Param("status") Integer status);
+	
+	
+	/**
+	 * 鏌ヨ鎵�鏈夎鍗�
+	 * 
+	 * @param channel
+	 * @return
+	 */
+	List<PDDOrder> listQuery(@Param("start") long start, @Param("count")int count, @Param("key")String key);
+
+	Long countQuery(@Param("key")String key);
+
 }
\ No newline at end of file

--
Gitblit v1.8.0