From 02d8f36a2a51a2ffcacdb619bee34077da61b328 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 10 一月 2019 15:23:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
index bbd72a1..2853b50 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
@@ -2,6 +2,7 @@
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 
@@ -109,7 +110,7 @@
 	 * @param minMoney
 	 * @return
 	 */
-	double countAllMoney(@Param("minMoney") Double minMoney);
+	BigDecimal countAllMoney(@Param("minMoney") Double minMoney);
 	
 	
 	/**
@@ -119,4 +120,25 @@
 	 */
 	List<Long> longTimeNoLogin(@Param("daysNum") int daysNum, @Param("list") List<Long> list);
 	
+	/**
+	 * 缁熻娴佸け鐢ㄦ埛鏁伴噺:锛� num 澶╂湭浣跨敤鐧诲綍骞朵笖鏃犱换浣曡祫閲戞祦鍔ㄧ殑璐﹀彿鏁伴噺锛�
+	 * @param num 180
+	 * @return
+	 */
+	long countLoseUser(@Param("num") int num);
+	
+	
+	/**
+	 * 绱鏈夎喘涔扮敤鎴锋暟
+	 * @return
+	 */
+	long countHasOrderUser();
+	
+
+	/**
+	 * 缁熻鏂板鐢ㄦ埛
+	 * @return
+	 */
+	List<Map<String, Object>> countNewUserByDate(@Param("type")Integer type, @Param("years") String years, 
+			@Param("startTime")String startTime, @Param("endTime")String endTime);
 }
\ No newline at end of file

--
Gitblit v1.8.0