From beef9055e75ec66abd95d642861e4aab74932a95 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 五月 2020 10:38:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoExtraService.java | 78 ++++++++++++++++++++++++++++++---------
1 files changed, 60 insertions(+), 18 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 aa21c6f..cf86291 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
@@ -2,7 +2,7 @@
import java.util.Date;
-import org.apache.ibatis.annotations.Param;
+import org.springframework.web.multipart.MultipartFile;
import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -16,6 +16,7 @@
/**
* 鑾峰彇鐢ㄦ埛绛夌骇涓�绾у叾浠栭檮鍔犱俊鎭�
+ *
* @param uid
* @return
* @throws UserInfoExtraException
@@ -24,6 +25,7 @@
/**
* 淇濆瓨鐢ㄦ埛棰濆淇℃伅-鏂板鎴栨洿鏂�
+ *
* @param userInfoExtra
* @throws UserInfoExtraException
*/
@@ -31,22 +33,18 @@
/**
* 鏇存柊鐢ㄦ埛绛夌骇
- * @param uid 鐢ㄦ埛id
+ *
+ * @param uid
+ * 鐢ㄦ埛id
* @return
* @throws UserInfoExtraException
*/
public void updateUserRankByUid(Long uid) throws UserInfoExtraException;
- /**
- * 鏍规嵁璁㈠崟鏇存柊
- * @param userInfoExtra
- * @return
- * @throws UserInfoExtraException
- */
- public UserInfoExtra updateRank(UserInfoExtra userInfoExtra) throws UserInfoExtraException;
/**
* 鐢ㄦ埛婵�娲婚個璇风爜
+ *
* @param uid
* @param inviteCode
* @return
@@ -56,6 +54,7 @@
/**
* 鑾峰彇鐢ㄦ埛闄勫姞淇℃伅
+ *
* @param uid
* @return
*/
@@ -63,34 +62,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(WXAccountInfoDTO wxAccount,Long uid, String code) throws UserInfoExtraException;
+ public void activationInviteWX(WXAccountInfoDTO wxAccount, Long uid, String code) throws UserInfoExtraException;
/**
* 鍒ゆ柇鏄惁鏄柊鐢ㄦ埛
+ *
* @param uid
* @return
*/
@@ -98,13 +101,15 @@
/**
* 鍒涘缓棰濆淇℃伅
+ *
* @param uid
* @throws UserInfoExtraException
*/
public void createUserInfoExtra(Long uid) throws UserInfoExtraException;
-
+
/**
* 鑾峰彇鐢ㄦ埛绛夌骇
+ *
* @param uid
* @return
*/
@@ -112,6 +117,7 @@
/**
* 鏍规嵁閭�璇风爜鏌ヨ鐢ㄦ埛
+ *
* @param inviteCode
* @return
* @throws UserInfoExtraException
@@ -120,6 +126,7 @@
/**
* 鑾峰彇閭�璇蜂汉鍏崇郴淇℃伅
+ *
* @param uid
* @param code
* @return
@@ -128,14 +135,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 +153,7 @@
/**
* 鏂扮増閭�璇锋縺娲�
+ *
* @param uid
* @param weiXinUser
* @throws UserInfoExtraException
@@ -152,14 +162,46 @@
/**
* 鏍规嵁鐢ㄦ埛id鏇存柊淇℃伅
+ *
* @param userInfoExtra
*/
public void updateActiveTime(Long uid, Date date);
+
+
+ /**
+ * 杩斿洖鐢ㄦ埛鎵�鏈夌浉鍏抽澶栦俊鎭�
+ *
+ * @param uid
+ * @return
+ */
+ public UserInfoExtra getUserALLInfo(Long uid);
+
+ /**
+ * 淇敼閭�璇风爜
+ *
+ * @param inviteCode
+ * @param uid
+ * @throws UserInfoExtraException
+ */
+ public void updateInviteCodeVip(String inviteCode, Long uid) throws UserInfoExtraException;
+
+
+ public void updateByPrimaryKeySelective(UserInfoExtra record);
+
/**
- *寮�鍚嚜鍔ㄦ彁鐜帮細 鏇存柊瓒呰繃鏈熼檺鐨�
- * @param days
+ * 鏇存柊閲戝竵
+ * @param uid
+ * @param goldCoin
*/
- void updateAutoExtract(@Param("days")Integer days);
+ public void addGoldCoinByUid(Long uid, Integer goldCoin);
+
+
+ /**
+ * 涓婁紶浜岀淮鐮�
+ * @param file
+ * @param uid
+ */
+ public void uploadERCode(MultipartFile file, Long uid);
}
--
Gitblit v1.8.0