From 45a24d7a84aa4f7d43fd2101ec4aac96b8c96f97 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 21 十月 2019 17:20:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoExtraService.java |   91 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 90 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoExtraService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoExtraService.java
index 9157fde..aa21c6f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoExtraService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoExtraService.java
@@ -1,6 +1,14 @@
 package com.yeshi.fanli.service.inter.user;
 
+import java.util.Date;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
+import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
+import com.yeshi.fanli.entity.bus.user.UserRank;
+import com.yeshi.fanli.entity.bus.user.WeiXinUser;
 import com.yeshi.fanli.exception.user.UserInfoExtraException;
 import com.yeshi.fanli.vo.user.UserInfoExtraVO;
 
@@ -27,7 +35,7 @@
 	 * @return
 	 * @throws UserInfoExtraException
 	 */
-	public UserInfoExtra updateUserRankByUid(Long uid) throws UserInfoExtraException;
+	public void updateUserRankByUid(Long uid) throws UserInfoExtraException;
 
 	/**
 	 * 鏍规嵁璁㈠崟鏇存柊
@@ -72,5 +80,86 @@
 	 *  缁熻鍚勪釜绛夌骇鐢ㄦ埛鏁�
 	 */
 	public long countByRankId(Long rankId);
+
+	/**
+	 * 寰俊閭�璇锋縺娲讳笂绾у叧绯� 1.5.3
+	 * @param uid
+	 * @param code
+	 * @throws UserInfoExtraException
+	 */
+	public void activationInviteWX(WXAccountInfoDTO wxAccount,Long uid, String code) throws UserInfoExtraException;
+
+	/**
+	 * 鍒ゆ柇鏄惁鏄柊鐢ㄦ埛
+	 * @param uid
+	 * @return
+	 */
+	public boolean isNewUser(Long uid);
+
+	/**
+	 * 鍒涘缓棰濆淇℃伅
+	 * @param uid
+	 * @throws UserInfoExtraException
+	 */
+	public void createUserInfoExtra(Long uid) throws UserInfoExtraException;
+	
+	/**
+	 * 鑾峰彇鐢ㄦ埛绛夌骇
+	 * @param uid
+	 * @return
+	 */
+	public UserRank gerUserRank(Long uid);
+
+	/**
+	 * 鏍规嵁閭�璇风爜鏌ヨ鐢ㄦ埛
+	 * @param inviteCode
+	 * @return
+	 * @throws UserInfoExtraException
+	 */
+	public UserInfo getUserByInviteCode(String inviteCode) throws UserInfoExtraException;
+
+	/**
+	 * 鑾峰彇閭�璇蜂汉鍏崇郴淇℃伅
+	 * @param uid
+	 * @param code
+	 * @return
+	 * @throws UserInfoExtraException
+	 */
+	public UserInfo getInviterInfo(Long uid, String wxUnionId) throws UserInfoExtraException;
+
+	/**
+	 * 鏇存柊淇℃伅 +  鍔犻攣
+	 * @param uid
+	 * @return
+	 */
+	public UserInfoExtra getByUidForUpdate(Long uid);
+	
+	/**
+	 * 鏇存柊鐢ㄦ埛閲戝竵
+	 * @param id
+	 * @param goldCoin
+	 * @return
+	 */
+	public void updateGoldCoin(Long id, Integer goldCoin);
+
+	/**
+	 * 鏂扮増閭�璇锋縺娲�
+	 * @param uid
+	 * @param weiXinUser
+	 * @throws UserInfoExtraException
+	 */
+	public void activeInviteWX(Long uid, WeiXinUser weiXinUser) throws UserInfoExtraException;
+
+	/**
+	 * 鏍规嵁鐢ㄦ埛id鏇存柊淇℃伅
+	 * @param userInfoExtra
+	 */
+	public void updateActiveTime(Long uid, Date date);
+	
+	/**
+	 *寮�鍚嚜鍔ㄦ彁鐜帮細 鏇存柊瓒呰繃鏈熼檺鐨�
+	 * @param days
+	 */
+	void updateAutoExtract(@Param("days")Integer days);
 	
 }

--
Gitblit v1.8.0