From d146365d6fdbe06f1c769ab93728d38b15fe1a49 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 23 二月 2020 14:26:26 +0800
Subject: [PATCH] 发圈接口修改

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java |  430 +++++++++++++++++++++++++++++------------------------
 1 files changed, 232 insertions(+), 198 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 a76ce7f..f24e8d4 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
@@ -1,200 +1,234 @@
-package com.yeshi.fanli.dao.mybatis;
+package com.yeshi.fanli.dao.mybatis;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dto.ChartTDO;
+import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.vo.user.UserInfoVO;
+
+public interface UserInfoMapper {
+
+	int deleteByPrimaryKey(Long id);
+
+	int insert(UserInfo record);
+
+	int insertSelective(UserInfo record);
+
+	UserInfo selectByPrimaryKey(Long id);
+
+	/**
+	 * 鏌ヨ鏈夋晥鐨�
+	 * 
+	 * @param id
+	 * @return
+	 */
+	UserInfo selectAvailableByPrimaryKey(Long id);
+
+	UserInfo selectByPrimaryKeyForUpdate(Long id);
+
+	int updateByPrimaryKeySelective(UserInfo record);
+
+	int updateByPrimaryKey(UserInfo record);
+
+	// 鍑忔帀鐢ㄦ埛绾㈠寘閲戦
+	int subHongBaoByUid(@Param("uid") long uid, @Param("money") BigDecimal money);
+
+	// 澧炲姞鐢ㄦ埛绾㈠寘閲戦
+	int addHongBaoByUid(@Param("uid") long uid, @Param("money") BigDecimal money);
+
+	void cleanPassword(long id);
+
+	BigDecimal getNewPeopleHB(Long id);
+
+	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-鍓处鍙�
+	 */
+	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
+	 *            鎺掑簭鏂瑰紡
+	 * @return
+	 */
+	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("userType") Integer userType);
+
+	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("userType") Integer userType);
+
+	/**
+	 * 缁熻褰撳墠鏌ヨ缁撴灉鎬婚噾棰�
+	 * 
+	 * @param title
+	 * @param userType
+	 * @param days
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 */
+	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
+	 *            缁熻褰撴湀 浜屽垯涓嶅彲鍚屾椂瀛樺湪
+	 * @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 澶╂湭鐧婚檰鐨勭敤鎴�
+	 * 
+	 * @param minMoney
+	 * @return
+	 */
+	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<ChartTDO> countNewUserByDate(@Param("channel") String channel, @Param("type") Integer type,
+			@Param("years") String years, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+	/**
+	 * 缁熻鏂板鐢ㄦ埛褰撴棩浜х敓璁㈠崟鐢ㄦ埛鏁伴噺
+	 * 
+	 * @return
+	 */
+	List<ChartTDO> getTodayHasOrder(@Param("channel") String channel, @Param("type") Integer type,
+			@Param("years") String years, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+	/**
+	 * 缁熻鏂板鐢ㄦ埛涓�鍛ㄤ骇鐢熻鍗曠敤鎴锋暟閲�
+	 * 
+	 * @return
+	 */
+	ChartTDO getWeekHasOrder(@Param("channel") String channel, @Param("startTime") String startTime,
+			@Param("endTime") String endTime, @Param("orderNum") Integer orderNum);
+
+	/**
+	 * 鏍规嵁鐢佃瘽鍙风爜銆侀個璇风爜鑾峰彇閭�璇风敤鎴�
+	 * 
+	 * @param phone
+	 * @param inviteCode
+	 * @return
+	 */
+	UserInfo getUserInfoByInviteCode(@Param("inviteCode") String inviteCode);
+
+	// 鏍规嵁AppId涓庣數璇濆彿鐮佽幏鍙栫敤鎴�
+	List<UserInfo> listByClosed(@Param("appId") String appId, @Param("phone") String phone);
+
+	long countAvaiableUser();
+
+	/**
+	 * 鏌ヨ婊¤冻鑷姩鎻愮幇鐢ㄦ埛
+	 * 
+	 * @param start
+	 * @param count
+	 * @return
+	 */
 
-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 {
-
-	int deleteByPrimaryKey(Long id);
-
-	int insert(UserInfo record);
-
-	int insertSelective(UserInfo record);
-
-	 UserInfo selectByPrimaryKey(Long id);
-
-	/**
-	 * 鏌ヨ鏈夋晥鐨�
-	 * 
-	 * @param id
-	 * @return
-	 */
-	UserInfo selectAvailableByPrimaryKey(Long id);
-
-	UserInfo selectByPrimaryKeyForUpdate(Long id);
-
-	int updateByPrimaryKeySelective(UserInfo record);
-
-	int updateByPrimaryKey(UserInfo record);
-
-	// 鍑忔帀鐢ㄦ埛绾㈠寘閲戦
-	int subHongBaoByUid(@Param("uid") long uid, @Param("money") BigDecimal money);
-
-	// 澧炲姞鐢ㄦ埛绾㈠寘閲戦
-	int addHongBaoByUid(@Param("uid") long uid, @Param("money") BigDecimal money);
-
-	void cleanPassword(long id);
-
-	BigDecimal getNewPeopleHB(Long id);
-
-	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);
-
-	Long getMaxUid();
-
-	/**
-	 * 铻嶅悎璐﹀彿
-	 * 
-	 * @param mainUid-涓昏处鍙�
-	 * @param 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
-	 *            鎺掑簭鏂瑰紡
-	 * @return
-	 */
-	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("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
-	 * @param startTime
-	 * @param endTime
-	 * @return
-	 */
-	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
-	 *            缁熻褰撴湀 浜屽垯涓嶅彲鍚屾椂瀛樺湪
-	 * @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 澶╂湭鐧婚檰鐨勭敤鎴�
-	 * 
-	 * @param minMoney
-	 * @return
-	 */
-	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);
-
+	List<UserInfo> getAutoExtractUser(@Param("start") int start, @Param("count") int count,
+			@Param("money") BigDecimal money, @Param("beganDate") String beganDate, @Param("endDate") String endDate);
+
+	/**
+	 * 鏍规嵁type妫�绱�
+	 * @param type
+	 * @param start
+	 * @param count
+	 * @return
+	 */
+	List<UserInfo> listByType(@Param("type")int type,@Param("start") long start, @Param("count")int count);
+
+	long countByType(int type);
+	
+	/**
+	 * 鏌ヨ婊¤冻鑷姩鎻愮幇鐢ㄦ埛
+	 * @param start
+	 * @param count
+	 * @return
+	 */
+	List<UserInfo> getAutoExtractUserTo1212(@Param("start") int start, @Param("count") int count);
 }
\ No newline at end of file

--
Gitblit v1.8.0