From 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 15:33:00 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoExtraService.java | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 103 insertions(+), 6 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 8c90605..29daafb 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,7 +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;
@@ -9,6 +16,7 @@
/**
* 鑾峰彇鐢ㄦ埛绛夌骇涓�绾у叾浠栭檮鍔犱俊鎭�
+ *
* @param uid
* @return
* @throws UserInfoExtraException
@@ -17,6 +25,7 @@
/**
* 淇濆瓨鐢ㄦ埛棰濆淇℃伅-鏂板鎴栨洿鏂�
+ *
* @param userInfoExtra
* @throws UserInfoExtraException
*/
@@ -24,7 +33,9 @@
/**
* 鏇存柊鐢ㄦ埛绛夌骇
- * @param uid 鐢ㄦ埛id
+ *
+ * @param uid
+ * 鐢ㄦ埛id
* @return
* @throws UserInfoExtraException
*/
@@ -32,6 +43,7 @@
/**
* 鏍规嵁璁㈠崟鏇存柊
+ *
* @param userInfoExtra
* @return
* @throws UserInfoExtraException
@@ -40,15 +52,17 @@
/**
* 鐢ㄦ埛婵�娲婚個璇风爜
+ *
* @param uid
* @param inviteCode
* @return
* @throws UserInfoExtraException
*/
- public String activateInviteCode(Long uid, String inviteCode, String platform, String version) throws UserInfoExtraException;
+ public String activateInviteCode(Long uid, String inviteCode) throws UserInfoExtraException;
/**
* 鑾峰彇鐢ㄦ埛闄勫姞淇℃伅
+ *
* @param uid
* @return
*/
@@ -56,34 +70,38 @@
/**
* 鑾峰彇鐢ㄦ埛閭�璇风爜,鑻ユ病鏈変笖瀛樺湪闃熷憳鍏崇郴 閭ｄ箞鑷姩鐢熸垚閭�璇风爜
+ *
* @param uid
* @return
* @throws UserInfoExtraException
*/
- public String getUserInviteCode(Long uid) throws UserInfoExtraException;
+ public String getInviteCodeByUid(Long uid);
/**
* 鑾峰彇鐢ㄦ埛棰濆淇℃伅鍏ㄩ儴琛嶇敓淇℃伅
+ *
* @param uid
* @return
*/
public UserInfoExtraVO getInfoExtraVOByUid(Long uid);
/**
- * 缁熻鍚勪釜绛夌骇鐢ㄦ埛鏁�
+ * 缁熻鍚勪釜绛夌骇鐢ㄦ埛鏁�
*/
public long countByRankId(Long rankId);
/**
* 寰俊閭�璇锋縺娲讳笂绾у叧绯� 1.5.3
+ *
* @param uid
* @param code
* @throws UserInfoExtraException
*/
- public void activationInviteWX(Long uid, String code, String platform, String version) throws UserInfoExtraException;
+ public void activationInviteWX(WXAccountInfoDTO wxAccount, Long uid, String code) throws UserInfoExtraException;
/**
* 鍒ゆ柇鏄惁鏄柊鐢ㄦ埛
+ *
* @param uid
* @return
*/
@@ -91,16 +109,95 @@
/**
* 鍒涘缓棰濆淇℃伅
+ *
* @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
+ */
+ public void updateAutoExtract(@Param("days") Integer days);
+
+ /**
+ * 杩斿洖鐢ㄦ埛鎵�鏈夌浉鍏抽澶栦俊鎭�
+ *
+ * @param uid
+ * @return
+ */
+ public UserInfoExtra getUserALLInfo(Long uid);
+
+ /**
+ * 淇敼閭�璇风爜
+ *
+ * @param inviteCode
+ * @param uid
+ * @throws UserInfoExtraException
+ */
+ public void updateInviteCodeVip(String inviteCode, Long uid) throws UserInfoExtraException;
+
}
--
Gitblit v1.8.0