From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoExtraService.java |  165 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 154 insertions(+), 11 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 7b4e2ff..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
@@ -1,6 +1,14 @@
 package com.yeshi.fanli.service.inter.user;
 
+import java.util.Date;
+
+import org.springframework.web.multipart.MultipartFile;
+
+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;
 
@@ -8,6 +16,7 @@
 
 	/**
 	 * 鑾峰彇鐢ㄦ埛绛夌骇涓�绾у叾浠栭檮鍔犱俊鎭�
+	 * 
 	 * @param uid
 	 * @return
 	 * @throws UserInfoExtraException
@@ -16,6 +25,7 @@
 
 	/**
 	 * 淇濆瓨鐢ㄦ埛棰濆淇℃伅-鏂板鎴栨洿鏂�
+	 * 
 	 * @param userInfoExtra
 	 * @throws UserInfoExtraException
 	 */
@@ -23,22 +33,18 @@
 
 	/**
 	 * 鏇存柊鐢ㄦ埛绛夌骇
-	 * @param uid 鐢ㄦ埛id
+	 * 
+	 * @param uid
+	 *            鐢ㄦ埛id
 	 * @return
 	 * @throws UserInfoExtraException
 	 */
-	public UserInfoExtra updateUserRankByUid(Long uid) 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
@@ -48,17 +54,154 @@
 
 	/**
 	 * 鑾峰彇鐢ㄦ埛闄勫姞淇℃伅
+	 * 
 	 * @param uid
 	 * @return
 	 */
 	public UserInfoExtra getUserInfoExtra(Long uid);
 
 	/**
-	 * 鑾峰彇鐢ㄦ埛閭�璇风爜
+	 * 鑾峰彇鐢ㄦ埛閭�璇风爜,鑻ユ病鏈変笖瀛樺湪闃熷憳鍏崇郴 閭d箞鑷姩鐢熸垚閭�璇风爜
+	 * 
 	 * @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;
+
+	/**
+	 * 鍒ゆ柇鏄惁鏄柊鐢ㄦ埛
+	 * 
+	 * @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 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 uid
+	 * @param goldCoin
+	 */
+	public void addGoldCoinByUid(Long uid, Integer goldCoin);
+
+	
+	/**
+	 * 涓婁紶浜岀淮鐮�
+	 * @param file
+	 * @param uid
+	 */
+	public void uploadERCode(MultipartFile file, Long uid);
 	
 }

--
Gitblit v1.8.0