From b9f8ef2c4737b6e6be4b12fc8f7bafb033bfcfe5 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 22 九月 2019 16:47:33 +0800
Subject: [PATCH] 金币BUG修改
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java | 131 +++++++++++++++++++++++++++----------------
1 files changed, 81 insertions(+), 50 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 3bd6a64..5128943 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
@@ -7,6 +7,7 @@
import org.apache.ibatis.annotations.Param;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.vo.user.UserInfoVO;
public interface UserInfoMapper {
@@ -16,9 +17,15 @@
int insertSelective(UserInfo record);
- UserInfo selectByPrimaryKey(Long id);
-
- UserInfo selectByPKey(Long id);
+ UserInfo selectByPrimaryKey(Long id);
+
+ /**
+ * 鏌ヨ鏈夋晥鐨�
+ *
+ * @param id
+ * @return
+ */
+ UserInfo selectAvailableByPrimaryKey(Long id);
UserInfo selectByPrimaryKeyForUpdate(Long id);
@@ -39,13 +46,19 @@
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();
@@ -55,31 +68,38 @@
* @param mainUid-涓昏处鍙�
* @param lessUid-鍓处鍙�
*/
- void connectUser(@Param("mainUid")Long mainUid,@Param("lessUid") Long lessUid);
-
-
+ void connectUser(@Param("mainUid") Long mainUid, @Param("lessUid") Long lessUid);
+
/**
*
* @param start
* @param count
- * @param key 鏌ヨ鏉′欢
- * @param userType 鐢ㄦ埛绫诲瀷
- * @param days 澶╂暟
- * @param startTime 娉ㄥ唽鏃堕棿 -灏�
- * @param endTime 娉ㄥ唽鏃堕棿 -澶�
- * @param orderMode 鎺掑簭鏂瑰紡
+ * @param key
+ * 鏌ヨ鏉′欢
+ * @param userType
+ * 鐢ㄦ埛绫诲瀷
+ * @param days
+ * 澶╂暟
+ * @param startTime
+ * 娉ㄥ唽鏃堕棿 -灏�
+ * @param endTime
+ * 娉ㄥ唽鏃堕棿 -澶�
+ * @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,
- @Param("startTime") String startTime, @Param("endTime") String endTime,
+ 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,
- @Param("startTime") String startTime, @Param("endTime") String endTime);
-
+
+ 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);
+
/**
* 缁熻褰撳墠鏌ヨ缁撴灉鎬婚噾棰�
+ *
* @param title
* @param userType
* @param days
@@ -87,84 +107,95 @@
* @param endTime
* @return
*/
- double querySumMoney(@Param("key") String key, @Param("userType")Integer userType, @Param("days")Integer days,
+ double querySumMoney(@Param("key") String key, @Param("userType") Integer userType, @Param("days") Integer days,
@Param("startTime") String startTime, @Param("endTime") String endTime);
-
+
/**
* 缁熻鐢ㄦ埛鏁伴噺
- * @param isToday 缁熻浠婃棩
- * @param isMonth 缁熻褰撴湀 浜屽垯涓嶅彲鍚屾椂瀛樺湪
+ *
+ * @param isToday
+ * 缁熻浠婃棩
+ * @param isMonth
+ * 缁熻褰撴湀 浜屽垯涓嶅彲鍚屾椂瀛樺湪
* @return
*/
long countNewUser(@Param("isToday") Integer isToday, @Param("isMonth") Integer isMonth);
-
+
/**
* 鏍规嵁绛夌骇缁熻鐢ㄦ埛鏁伴噺
+ *
* @param rank
* @return
*/
long countRank(@Param("rank") Integer rank);
-
+
/**
- * 缁熻鎵�鏈夌敤鎴锋�婚噾棰� 鎴� 鍙彁鐜伴噾棰�
+ * 缁熻鎵�鏈夌敤鎴锋�婚噾棰� 鎴� 鍙彁鐜伴噾棰�
+ *
* @param minMoney
* @return
*/
BigDecimal countAllMoney(@Param("minMoney") Double minMoney);
-
-
+
/**
- * 瓒呰繃 daysNum 澶╂湭鐧婚檰鐨勭敤鎴�
+ * 瓒呰繃 daysNum 澶╂湭鐧婚檰鐨勭敤鎴�
+ *
* @param minMoney
* @return
*/
List<Long> longTimeNoLogin(@Param("daysNum") int daysNum, @Param("list") List<Long> list);
-
+
/**
* 缁熻娴佸け鐢ㄦ埛鏁伴噺:锛� num 澶╂湭浣跨敤鐧诲綍骞朵笖鏃犱换浣曡祫閲戞祦鍔ㄧ殑璐﹀彿鏁伴噺锛�
- * @param num 180
+ *
+ * @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);
-
-
+ 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);
-
-
+ 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);
-
-
+ 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);
+ UserInfo getInfoByPhoneOrInviteCode(@Param("phone") String phone, @Param("inviteCode") String inviteCode);
+ // 鏍规嵁AppId涓庣數璇濆彿鐮佽幏鍙栫敤鎴�
+ List<UserInfo> listByClosed(@Param("appId") String appId, @Param("phone") String phone);
+
+ long countAvaiableUser();
}
\ No newline at end of file
--
Gitblit v1.8.0