From 651a15c78f668bef3859d9ed1bb7ad0b669d3600 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 七月 2020 17:52:07 +0800
Subject: [PATCH] 多APP优化
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java | 77 +++++++++++++++++++++++++-------------
1 files changed, 50 insertions(+), 27 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 84feedf..cd498e6 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
@@ -3,6 +3,7 @@
import java.math.BigDecimal;
import java.util.List;
+import com.yeshi.fanli.entity.SystemEnum;
import org.apache.ibatis.annotations.Param;
import com.yeshi.fanli.dto.ChartTDO;
@@ -46,33 +47,53 @@
BigDecimal getMyHB(Long id);
// 鏍规嵁AppId涓庡井淇nionID鑾峰彇鐢ㄦ埛
- List<UserInfo> listByAppIdAndWXUnionId(@Param("appId") String appId, @Param("unionId") String unionId);
-
- // 鏍规嵁AppId涓庢窐瀹漁penId鑾峰彇鐢ㄦ埛
- List<UserInfo> listByAppIdAndTaoBaoOpenId(@Param("appId") String appId, @Param("openId") String openId);
-
- // 鏍规嵁AppId涓庣數璇濆彿鐮佽幏鍙栫敤鎴�
- List<UserInfo> listByAppIdAndPhone(@Param("appId") String appId, @Param("phone") String phone);
-
- // 鏍规嵁鑾峰彇鐢佃瘽鍙风爜鏈夋晥鐢ㄦ埛
- UserInfo getEffectiveUserInfoByPhone(@Param("phone") String phone);
-
- // 鏍规嵁鑾稺XUnionId鏈夋晥鐢ㄦ埛
- UserInfo getEffectiveUserInfoByWXUnionId(@Param("unionId") String unionId);
-
- //鏍规嵁寰俊openid鏌ヨ
- UserInfo getEffectiveUserInfoByWXOpenId(@Param("wxOpenId") String wxOpenId);
-
- Long getMaxUid();
/**
- * 铻嶅悎璐﹀彿
- *
- * @param mainUid-涓昏处鍙�
- * @param lessUid-鍓处鍙�
+ * 鏍规嵁绯荤粺涓庡井淇nionId鑾峰彇鐢ㄦ埛
+ * @param system
+ * @param unionId
+ * @return
*/
- void connectUser(@Param("mainUid") Long mainUid, @Param("lessUid") Long lessUid);
+ List<UserInfo> listBySystemAndWXUnionId(@Param("system") SystemEnum system, @Param("unionId") String unionId);
+ /**
+ * 鏍规嵁绯荤粺涓庢窐瀹濈殑openid鑾峰彇鐢ㄦ埛
+ * @param system
+ * @param openId
+ * @return
+ */
+ List<UserInfo> listBySystemAndTaoBaoOpenId(@Param("system") SystemEnum system, @Param("openId") String openId);
+
+ /**
+ * 鏍规嵁绯荤粺涓庣數璇濆彿鐮佽幏鍙栫敤鎴�
+ * @param system
+ * @param phone
+ * @return
+ */
+ List<UserInfo> listBySystemAndPhone(@Param("system") SystemEnum system, @Param("phone") String phone);
+
+ // 鏍规嵁鑾峰彇鐢佃瘽鍙风爜鏈夋晥鐢ㄦ埛
+ UserInfo getEffectiveUserInfoByPhone(@Param("phone") String phone,@Param("system") SystemEnum system);
+
+ // 鏍规嵁鑾稺XUnionId鏈夋晥鐢ㄦ埛
+ UserInfo getEffectiveUserInfoByWXUnionId(@Param("unionId") String unionId,@Param("system") SystemEnum system);
+
+ //鏍规嵁寰俊openid鏌ヨ
+ UserInfo getEffectiveUserInfoByWXOpenId(@Param("wxOpenId") String wxOpenId,@Param("system") SystemEnum system);
+
+ Long getMaxUid();
+
+ List<UserInfoVO> queryInfo(@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("userType") Integer userType, @Param("level")String level, @Param("activeCode") Integer activeCode);
+
+ long countInfo(@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("userType") Integer userType, @Param("level")String level,
+ @Param("activeCode") Integer activeCode);
+
+
/**
*
* @param start
@@ -94,11 +115,13 @@
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);
+ @Param("orderField") Integer orderField, @Param("orderMode") Integer orderMode,
+ @Param("userType") Integer userType, @Param("level")String level, @Param("activeCode") Integer activeCode);
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("endTime") String endTime,@Param("userType") Integer userType, @Param("level")String level,
+ @Param("activeCode") Integer activeCode);
/**
* 缁熻褰撳墠鏌ヨ缁撴灉鎬婚噾棰�
@@ -209,7 +232,7 @@
* @param count
* @return
*/
-
+
List<UserInfo> getAutoExtractUser(@Param("start") int start, @Param("count") int count,
@Param("money") BigDecimal money, @Param("beganDate") String beganDate, @Param("endDate") String endDate);
@@ -230,5 +253,5 @@
* @param count
* @return
*/
- List<UserInfo> getAutoExtractUserTo1212(@Param("start") int start, @Param("count") int count);
+ List<UserInfo> getAutoExtractUserTo1212(@Param("start") int start, @Param("count") int count);
}
\ No newline at end of file
--
Gitblit v1.8.0