From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoExtraService.java | 50 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 insertions(+), 10 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 28dd6d8..64f249a 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
@@ -16,6 +16,7 @@
/**
* 鑾峰彇鐢ㄦ埛绛夌骇涓�绾у叾浠栭檮鍔犱俊鎭�
+ *
* @param uid
* @return
* @throws UserInfoExtraException
@@ -24,6 +25,7 @@
/**
* 淇濆瓨鐢ㄦ埛棰濆淇℃伅-鏂板鎴栨洿鏂�
+ *
* @param userInfoExtra
* @throws UserInfoExtraException
*/
@@ -31,7 +33,9 @@
/**
* 鏇存柊鐢ㄦ埛绛夌骇
- * @param uid 鐢ㄦ埛id
+ *
+ * @param uid
+ * 鐢ㄦ埛id
* @return
* @throws UserInfoExtraException
*/
@@ -39,6 +43,7 @@
/**
* 鏍规嵁璁㈠崟鏇存柊
+ *
* @param userInfoExtra
* @return
* @throws UserInfoExtraException
@@ -47,6 +52,7 @@
/**
* 鐢ㄦ埛婵�娲婚個璇风爜
+ *
* @param uid
* @param inviteCode
* @return
@@ -56,6 +62,7 @@
/**
* 鑾峰彇鐢ㄦ埛闄勫姞淇℃伅
+ *
* @param uid
* @return
*/
@@ -63,6 +70,7 @@
/**
* 鑾峰彇鐢ㄦ埛閭�璇风爜,鑻ユ病鏈変笖瀛樺湪闃熷憳鍏崇郴 閭ｄ箞鑷姩鐢熸垚閭�璇风爜
+ *
* @param uid
* @return
* @throws UserInfoExtraException
@@ -71,26 +79,29 @@
/**
* 鑾峰彇鐢ㄦ埛棰濆淇℃伅鍏ㄩ儴琛嶇敓淇℃伅
+ *
* @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(WXAccountInfoDTO wxAccount,Long uid, String code) throws UserInfoExtraException;
+ public void activationInviteWX(WXAccountInfoDTO wxAccount, Long uid, String code) throws UserInfoExtraException;
/**
* 鍒ゆ柇鏄惁鏄柊鐢ㄦ埛
+ *
* @param uid
* @return
*/
@@ -98,13 +109,15 @@
/**
* 鍒涘缓棰濆淇℃伅
+ *
* @param uid
* @throws UserInfoExtraException
*/
public void createUserInfoExtra(Long uid) throws UserInfoExtraException;
-
+
/**
* 鑾峰彇鐢ㄦ埛绛夌骇
+ *
* @param uid
* @return
*/
@@ -112,6 +125,7 @@
/**
* 鏍规嵁閭�璇风爜鏌ヨ鐢ㄦ埛
+ *
* @param inviteCode
* @return
* @throws UserInfoExtraException
@@ -120,6 +134,7 @@
/**
* 鑾峰彇閭�璇蜂汉鍏崇郴淇℃伅
+ *
* @param uid
* @param code
* @return
@@ -128,14 +143,16 @@
public UserInfo getInviterInfo(Long uid, String wxUnionId) throws UserInfoExtraException;
/**
- * 鏇存柊淇℃伅 + 鍔犻攣
+ * 鏇存柊淇℃伅 + 鍔犻攣
+ *
* @param uid
* @return
*/
public UserInfoExtra getByUidForUpdate(Long uid);
-
+
/**
* 鏇存柊鐢ㄦ埛閲戝竵
+ *
* @param id
* @param goldCoin
* @return
@@ -144,6 +161,7 @@
/**
* 鏂扮増閭�璇锋縺娲�
+ *
* @param uid
* @param weiXinUser
* @throws UserInfoExtraException
@@ -152,21 +170,33 @@
/**
* 鏍规嵁鐢ㄦ埛id鏇存柊淇℃伅
+ *
* @param userInfoExtra
*/
public void updateActiveTime(Long uid, Date date);
-
+
/**
- *寮�鍚嚜鍔ㄦ彁鐜帮細 鏇存柊瓒呰繃鏈熼檺鐨�
+ * 寮�鍚嚜鍔ㄦ彁鐜帮細 鏇存柊瓒呰繃鏈熼檺鐨�
+ *
* @param days
*/
- public void updateAutoExtract(@Param("days")Integer days);
+ public void updateAutoExtract(@Param("days") Integer days);
/**
* 杩斿洖鐢ㄦ埛鎵�鏈夌浉鍏抽澶栦俊鎭�
+ *
* @param uid
* @return
*/
public UserInfoExtra getUserALLInfo(Long uid);
-
+
+ /**
+ * 淇敼閭�璇风爜
+ *
+ * @param inviteCode
+ * @param uid
+ * @throws UserInfoExtraException
+ */
+ public void updateInviteCode(String inviteCode, Long uid) throws UserInfoExtraException;
+
}
--
Gitblit v1.8.0