From fe879975a3e8a0a1aa280fb839e02d159bfbcff8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 18:04:38 +0800
Subject: [PATCH] 金币任务多次获取bug修改

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java |   78 +++++++++++++++++++++++++++++++++++----
 1 files changed, 70 insertions(+), 8 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..3a3c31e 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,10 +2,12 @@
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 
 import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.vo.user.UserInfoVO;
 
 public interface UserInfoMapper {
 
@@ -38,14 +40,21 @@
 	BigDecimal getMyHB(Long id);
 
 	// 鏍规嵁AppId涓庡井淇nionID鑾峰彇鐢ㄦ埛
-	UserInfo getUserInfoByAppIdAndWXUnionId(@Param("appId") String appId, @Param("unionId") String unionId);
+	List<UserInfo> listByAppIdAndWXUnionId(@Param("appId") String appId, @Param("unionId") String unionId);
 
 	// 鏍规嵁AppId涓庢窐瀹漁penId鑾峰彇鐢ㄦ埛
-	UserInfo getUserInfoByAppIdAndTaoBaoOpenId(@Param("appId") String appId, @Param("openId") String openId);
+	List<UserInfo> listByAppIdAndTaoBaoOpenId(@Param("appId") String appId, @Param("openId") String openId);
 
 	// 鏍规嵁AppId涓庣數璇濆彿鐮佽幏鍙栫敤鎴�
-	UserInfo getUserInfoByAppIdAndPhone(@Param("appId") String appId, @Param("phone") String phone);
-
+	List<UserInfo> listByAppIdAndPhone(@Param("appId") String appId, @Param("phone") String phone);
+	
+	// 鏍规嵁鑾峰彇鐢佃瘽鍙风爜鏈夋晥鐢ㄦ埛
+	UserInfo getEffectiveUserInfoByPhone(@Param("phone") String phone);
+	
+	// 鏍规嵁鑾稺XUnionId鏈夋晥鐢ㄦ埛
+	UserInfo getEffectiveUserInfoByWXUnionId(@Param("unionId") String unionId);
+	
+	
 	Long getMaxUid();
 
 	/**
@@ -69,12 +78,14 @@
 	 * @param orderMode  鎺掑簭鏂瑰紡
 	 * @return
 	 */
-	List<UserInfo> query(@Param("start") long start, @Param("count") int count, @Param("key") String key,
-			@Param("userType")Integer userType,	@Param("days")Integer days,
+	List<UserInfoVO> query(@Param("start") long start, @Param("count") int count, @Param("userState")Integer userState, 
+			@Param("key") String key, @Param("keyType") Integer keyType,
+			@Param("userRank") String userRank,	@Param("days")Integer days,
 			@Param("startTime") String startTime, @Param("endTime") String endTime, 
 			@Param("orderField") Integer orderField, @Param("orderMode") Integer orderMode);
 	
-	long queryCount(@Param("key") String key, @Param("userType")Integer userType,	@Param("days")Integer days,
+	long queryCount( @Param("userState")Integer userState, @Param("key") String key,  @Param("keyType") Integer keyType,
+			@Param("userRank")String userRank,@Param("days")Integer days,
 			@Param("startTime") String startTime, @Param("endTime") String endTime);
 	
 	/**
@@ -109,7 +120,7 @@
 	 * @param minMoney
 	 * @return
 	 */
-	double countAllMoney(@Param("minMoney") Double minMoney);
+	BigDecimal countAllMoney(@Param("minMoney") Double minMoney);
 	
 	
 	/**
@@ -119,4 +130,55 @@
 	 */
 	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("channel")String channel,@Param("type")Integer type, @Param("years") String years, 
+			@Param("startTime")String startTime, @Param("endTime")String endTime);
+	
+	
+	/**
+	 * 缁熻鏂板鐢ㄦ埛褰撴棩浜х敓璁㈠崟鐢ㄦ埛鏁伴噺
+	 * @return
+	 */
+	List<Map<String, Object>> getTodayHasOrder(@Param("channel")String channel,@Param("type")Integer type, @Param("years") String years, 
+			@Param("startTime")String startTime, @Param("endTime")String endTime);
+	
+	
+	/**
+	 * 缁熻鏂板鐢ㄦ埛涓�鍛ㄤ骇鐢熻鍗曠敤鎴锋暟閲�
+	 * @return
+	 */
+	Map<String, Object> getWeekHasOrder(@Param("channel")String channel, @Param("startTime")String startTime, 
+			@Param("endTime")String endTime, @Param("orderNum")Integer orderNum);
+	
+	
+	/**
+	 * 鏍规嵁鐢佃瘽鍙风爜銆侀個璇风爜鑾峰彇閭�璇风敤鎴�
+	 * @param phone
+	 * @param inviteCode
+	 * @return
+	 */
+	UserInfo getInfoByPhoneOrInviteCode(@Param("phone")String phone, @Param("inviteCode")String inviteCode);
+	
+	
+	// 鏍规嵁AppId涓庣數璇濆彿鐮佽幏鍙栫敤鎴�
+	List<UserInfo> listByClosed(@Param("appId") String appId, @Param("phone") String phone);
+
 }
\ No newline at end of file

--
Gitblit v1.8.0