From 148af6b2f57be264c84d0991237fbd7ddea491a4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 04 十一月 2019 09:55:55 +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/impl/user/UserInfoExtraServiceImpl.java | 389 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 273 insertions(+), 116 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java
index a30b7c6..bfaee97 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.impl.user;
+import java.io.InputStream;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -13,9 +14,13 @@
import org.springframework.stereotype.Service;
import org.yeshi.utils.DateUtil;
+import org.yeshi.utils.HttpUtil;
+import org.yeshi.utils.entity.FileUploadResult;
+import org.yeshi.utils.tencentcloud.COSManager;
import com.yeshi.fanli.dao.mybatis.user.UserInfoExtraMapper;
import com.yeshi.fanli.dao.mybatis.user.UserRankRecordMapper;
+import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
@@ -26,7 +31,6 @@
import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.order.CommonOrderCountService;
import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
@@ -34,19 +38,19 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserInviteRecordService;
import com.yeshi.fanli.service.inter.user.UserRankService;
+import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.wx.WXLoginUtil;
import com.yeshi.fanli.vo.user.UserInfoExtraVO;
-
@Service
public class UserInfoExtraServiceImpl implements UserInfoExtraService {
@Resource
private UserInfoExtraMapper userInfoExtraMapper;
-
+
@Resource
private UserRankRecordMapper userRankRecordMapper;
@@ -58,22 +62,21 @@
@Resource
private ConfigService configService;
-
+
@Resource
private ThreeSaleSerivce threeSaleSerivce;
-
+
@Resource
private UserInfoService userInfoService;
-
+
@Resource
private UserAccountService userAccountService;
-
+
@Resource
private ForbiddenUserIdentifyCodeService forbiddenUserIdentifyCodeService;
-
+
@Resource
private UserInviteRecordService userInviteRecordService;
-
@Override
public UserInfoExtraVO getRankInfo(Long uid) throws UserInfoExtraException, Exception {
@@ -83,7 +86,7 @@
throw new UserInfoExtraException(1, "鐢ㄦ埛闄勫姞淇℃伅涓嶅瓨鍦�");
}
- // 绛夌骇瀵圭収琛�
+ // 绛夌骇瀵圭収琛�
String contrast = configService.get("user_rank_contrast");
extraVO.setRankContrast(contrast);
// 鐗瑰埆鎻愰啋
@@ -91,11 +94,11 @@
extraVO.setRankTip(rankTip);
Integer rankOrderNum = extraVO.getRankOrderNum();
-
+
UserRank userRank = extraVO.getUserRank();
// 闈掗摐绛夌骇涓嶈繑鍥炴伃鍠滆鍙� 娉細闈掗摐绛夌骇id 蹇呴』涓�1
if (userRank != null && userRank.getId() != null && userRank.getId() > 1) {
-
+
String rankMsg = null;
Integer rankSource = extraVO.getRankSource();
switch (rankSource) {
@@ -150,13 +153,13 @@
}
@Override
- public void updateUserRankByUid(Long uid) throws UserInfoExtraException{
+ public void updateUserRankByUid(Long uid) throws UserInfoExtraException {
if (uid == null || uid == 0) {
return;
}
-
+
boolean isupdateRank = true;
-
+
UserInfoExtra userInfoExtra = userInfoExtraMapper.getInfoExtraByUid(uid);
if (userInfoExtra != null && userInfoExtra.getId() != null) {
// 鍒ゆ柇褰撴湀鏄惁宸叉洿鏂�
@@ -166,25 +169,25 @@
if (sdf.format(rankUpdateTime).equals(sdf.format(new Date()))) {
isupdateRank = false;
}
- }
+ }
} else {
userInfoExtra = new UserInfoExtra();
userInfoExtra.setUserInfo(new UserInfo(uid));
}
-
+
// 鏇存柊绛夌骇
if (isupdateRank) {
updateRank(userInfoExtra);
}
}
-
+
@Override
- public void createUserInfoExtra (Long uid) throws UserInfoExtraException{
+ public void createUserInfoExtra(Long uid) throws UserInfoExtraException {
UserInfoExtra userInfoExtra = userInfoExtraMapper.getInfoExtraByUid(uid);
if (userInfoExtra != null) {
return;
- }
-
+ }
+
userInfoExtra = new UserInfoExtra();
userInfoExtra.setUserInfo(new UserInfo(uid));
userInfoExtra.setFirstLoginTime(new Date());
@@ -192,20 +195,19 @@
userInfoExtra.setUpdateTime(new Date());
userInfoExtraMapper.insertSelective(userInfoExtra);
}
-
-
+
@Override
public UserInfoExtra updateRank(UserInfoExtra userInfoExtra) throws UserInfoExtraException {
UserInfo userInfo = userInfoExtra.getUserInfo();
- if (userInfo == null ) {
+ if (userInfo == null) {
throw new UserInfoExtraException(1, "鐢ㄦ埛涓嶅瓨鍦�");
}
-
+
Long uid = userInfo.getId();
- if (uid == null ) {
+ if (uid == null) {
throw new UserInfoExtraException(1, "鐢ㄦ埛ID涓嶅瓨鍦�");
- }
-
+ }
+
List<UserRank> listRank = userRankService.getAllRank();
if (listRank == null || listRank.size() == 0) {
throw new UserInfoExtraException(1, "绯荤粺绛夌骇涓嶅瓨鍦�");
@@ -258,7 +260,6 @@
userInfoExtra.setRankSource(Constant.TYPE_REBATE);
}
-
if (rank != null) {
userInfoExtra.setUserRank(rank);
} else {
@@ -270,21 +271,21 @@
break;
}
}
-
+
// 绛夌骇鏇存柊鏃堕棿 褰撴湀1鍙�
- Calendar calendar1=Calendar.getInstance();
- calendar1.set(Calendar.DAY_OF_MONTH, 1);
+ Calendar calendar1 = Calendar.getInstance();
+ calendar1.set(Calendar.DAY_OF_MONTH, 1);
userInfoExtra.setRankUpdateTime(calendar1.getTime());
-
+
// 淇濆瓨淇℃伅骞惰繑鍥�
saveUserInfoExtra(userInfoExtra);
-
+
UserRankRecord userRankRecord = new UserRankRecord();
userRankRecord.setUid(uid);
userRankRecord.setRankId(rank.getId());
userRankRecord.setCreateTime(new Date());
userRankRecordMapper.insertSelective(userRankRecord);
-
+
return userInfoExtra;
}
@@ -320,19 +321,19 @@
}
return userInfoExtra;
}
-
+
@Override
- public String activateInviteCode(Long uid, String inviteCode) throws UserInfoExtraException{
+ public String activateInviteCode(Long uid, String inviteCode) throws UserInfoExtraException {
if (uid == null || inviteCode == null) {
throw new UserInfoExtraException(1, "鐢ㄦ埛id銆侀個璇风爜涓嶈兘涓虹┖");
}
-
+
// 琚個璇蜂汉淇℃伅
UserInfo invitee = userInfoService.selectByPKey(uid);
if (invitee == null) {
throw new UserInfoExtraException(1, "鐢ㄦ埛涓嶅瓨鍦�");
}
-
+
UserInfoExtra extra = userInfoExtraMapper.getInfoExtraByUid(uid);
if (extra != null) {
String inviteCodeHas = extra.getInviteCode();
@@ -340,13 +341,13 @@
throw new UserInfoExtraException(1, "宸插瓨鍦ㄩ個璇风爜,璇峰埛鏂伴〉闈�");
}
}
-
+
// 閭�璇蜂汉淇℃伅
UserInfo inviter = userInfoService.getInfoByPhoneOrInviteCode(inviteCode, inviteCode);
if (inviter == null) {
throw new UserInfoExtraException(1, "涓婄骇閭�璇风爜涓嶅瓨鍦�");
}
-
+
// 缁戝畾鍏崇郴
try {
threeSaleSerivce.bindRelationshipByInviteCode(invitee, inviter);
@@ -358,43 +359,40 @@
}
throw new UserInfoExtraException(1, "婵�娲诲け璐�");
}
-
-
+
// 閭�璇风爜鏈夋晥銆佺敓鎴愰個璇风爜
- String code = UserUtil.getInviteCode(uid);
+ String code = UserUtil.getInviteCode(uid);
if (code == null || code.trim().length() == 0) {
throw new UserInfoExtraException(1, "婵�娲荤爜鐢熸垚澶辫触");
}
-
+
UserInfoExtra userInfoExtra = new UserInfoExtra();
userInfoExtra.setUserInfo(invitee);
userInfoExtra.setInviteCode(code);
-
+
// 淇濆瓨棰濆淇℃伅
saveUserInfoExtra(userInfoExtra);
-
-
+
Long id = userInfoExtra.getId();
if (id == null) {
throw new UserInfoExtraException(1, "婵�娲荤爜鐢熸垚澶辫触");
}
-
+
return code;
}
-
-
+
@Override
- public void activationInviteWX(Long uid, String code) throws UserInfoExtraException{
+ public void activationInviteWX(WXAccountInfoDTO wxAccount, Long uid, String code) throws UserInfoExtraException {
if (uid == null || code == null) {
throw new UserInfoExtraException(1, "婵�娲讳俊鎭笉瀹屾暣");
}
-
+
// 鐢ㄦ埛淇℃伅
UserInfo invitee = userInfoService.selectByPKey(uid);
if (invitee == null) {
throw new UserInfoExtraException(1, "鐢ㄦ埛涓嶅瓨鍦�");
}
-
+
// 鐢ㄦ埛棰濆淇℃伅
UserInfoExtra extra = userInfoExtraMapper.getInfoExtraByUid(uid);
if (extra != null) {
@@ -403,9 +401,10 @@
throw new UserInfoExtraException(1, "宸茬粡婵�娲�, 鏃犻渶鍐嶆婵�娲�");
}
}
-
+
// 鑾峰彇寰俊淇℃伅
- WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code);
+ WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code, wxAccount.getAppId(),
+ wxAccount.getAppSecret());
if (weiXinUser == null) {
throw new UserInfoExtraException(1, "寰俊鎺堟潈澶辫触");
}
@@ -413,7 +412,7 @@
if (wxUnionId == null || wxUnionId.trim().length() == 0) {
throw new UserInfoExtraException(1, "寰俊鎺堟潈澶辫触");
}
-
+
// 楠岃瘉鏁版嵁
String wxUnionIdExist = invitee.getWxUnionId();
if (StringUtil.isNullOrEmpty(wxUnionIdExist)) {
@@ -421,46 +420,59 @@
if (newUser != null) {
throw new UserInfoExtraException(1, "姝ゅ井淇″凡琚叾浠栧笎鍙风粦瀹�");
}
-
+
// 鑷姩缁戝畾寰俊
UserInfo updateUserInfo = new UserInfo(uid);
updateUserInfo.setWxOpenId(weiXinUser.getOpenid());
updateUserInfo.setWxUnionId(weiXinUser.getUnionid());
updateUserInfo.setWxName(weiXinUser.getNickname());
updateUserInfo.setWxPic(weiXinUser.getHeadimgurl());
-
+
// 灏嗛粯璁ゆ樀绉版浛鎹㈡垚寰俊鏄电О
String defaultNickName = Constant.systemCommonConfig.getDefaultNickName();
if (!StringUtil.isNullOrEmpty(defaultNickName) && !StringUtil.isNullOrEmpty(weiXinUser.getNickname())) {
defaultNickName = defaultNickName + uid;
- if ((defaultNickName.equals(invitee.getNickName()) || "杩斿埄鍒�".equals(invitee.getNickName()))) {
+ if ((defaultNickName.equals(invitee.getNickName()) || "杩斿埄鍒�".equals(invitee.getNickName())
+ || invitee.getNickName().startsWith(Constant.systemCommonConfig.getDefaultNickName()))) {
updateUserInfo.setNickName(weiXinUser.getNickname());
}
}
-
+
// 灏嗛粯璁ゅご鍍忔浛鎹㈡垚寰俊澶村儚
String defaultPortrait = Constant.systemCommonConfig.getDefaultPortrait();
if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl()) && !StringUtil.isNullOrEmpty(defaultPortrait)
&& defaultPortrait.equals(invitee.getPortrait())) {
- updateUserInfo.setPortrait(weiXinUser.getHeadimgurl());
+ String headimgurl = weiXinUser.getHeadimgurl();
+ InputStream asInputStream = HttpUtil.getAsInputStream(headimgurl);
+ if (asInputStream == null) {
+ LogHelper.test("寰俊澶村儚涓嬭浇澶辫触: " +weiXinUser.getUnionid()+ " " + headimgurl);
+ } else {
+ FileUploadResult result = COSManager.getInstance().uploadFile(asInputStream,
+ String.format("/portrait/wx/%s_%s.jpg", weiXinUser.getUnionid(), System.currentTimeMillis() + ""));
+ if (result != null && !StringUtil.isNullOrEmpty(result.getUrl())) {
+ headimgurl = result.getUrl();
+ } else {
+ LogHelper.test("寰俊澶村儚涓婁紶澶辫触: " +weiXinUser.getUnionid()+ " " + headimgurl);
+ }
+ }
+ updateUserInfo.setPortrait(headimgurl);
}
-
+
userInfoService.updateByPrimaryKeySelective(updateUserInfo);
-
- } else if (!wxUnionId.equals(wxUnionIdExist)){
+
+ } else if (!wxUnionId.equals(wxUnionIdExist)) {
throw new UserInfoExtraException(1, "缁戝畾寰俊涓庢縺娲诲井淇′笉涓�鑷�");
}
-
-
+
// 閭�璇蜂汉ID -1.5.3鏂扮増
Long inviterId = userInviteRecordService.getNewestInviterId(wxUnionId);
-
+
// 鍏煎1.5.3 涔嬪墠鐗堟湰
ThreeSale threeSale = threeSaleSerivce.getByWorkerId(uid);
if (inviterId == null && threeSale != null) {
Long bossId = threeSale.getBoss().getId();
UserInfoExtra inviterExtra = userInfoExtraMapper.getInfoExtraByUid(bossId);
- if (inviterExtra != null && inviterExtra.getInviteCode() == null ) {
+ if (inviterExtra != null && inviterExtra.getInviteCode() == null) {
// 鏇存柊閭�璇风爜
UserInfoExtra inviterInfoExtra = new UserInfoExtra();
inviterInfoExtra.setId(inviterExtra.getId());
@@ -468,12 +480,12 @@
userInfoExtraMapper.updateByPrimaryKeySelective(inviterInfoExtra);
}
}
-
+
// 娌℃湁琚個璇疯繃
if (inviterId == null && threeSale == null) {
throw new UserInfoExtraException(1, "娌℃湁瀵瑰簲鐨勯個璇峰叧绯�");
}
-
+
// 缁戝畾鍏崇郴
try {
threeSaleSerivce.bindRelationshipByWX(invitee, inviterId, threeSale);
@@ -485,10 +497,140 @@
}
throw new UserInfoExtraException(1, "鍏崇郴缁戝畾鏃跺け璐�");
}
-
-
+
// 閭�璇风爜鏈夋晥銆佺敓鎴愰個璇风爜
- String inviteCode = UserUtil.getInviteCode(uid);
+ String inviteCode = UserUtil.getInviteCode(uid);
+ if (inviteCode == null || inviteCode.trim().length() == 0) {
+ throw new UserInfoExtraException(1, "婵�娲荤爜鐢熸垚澶辫触");
+ }
+ // 淇濆瓨閭�璇风爜
+ UserInfoExtra userInfoExtra = new UserInfoExtra();
+ userInfoExtra.setUserInfo(invitee);
+ userInfoExtra.setInviteCode(inviteCode);
+ userInfoExtra.setUpdateTime(new Date());
+ if (extra != null) {
+ userInfoExtra.setId(extra.getId());
+ userInfoExtraMapper.updateByPrimaryKeySelective(userInfoExtra);
+ } else {
+ userInfoExtra.setCreateTime(new Date());
+ userInfoExtraMapper.insertSelective(userInfoExtra);
+ }
+ }
+
+
+ @Override
+ public void activeInviteWX(Long uid, WeiXinUser weiXinUser) throws UserInfoExtraException {
+ if (uid == null || weiXinUser == null) {
+ throw new UserInfoExtraException(1, "婵�娲讳俊鎭笉瀹屾暣");
+ }
+
+ // 鐢ㄦ埛淇℃伅
+ UserInfo invitee = userInfoService.selectByPKey(uid);
+ if (invitee == null) {
+ throw new UserInfoExtraException(1, "鐢ㄦ埛涓嶅瓨鍦�");
+ }
+
+ // 鐢ㄦ埛棰濆淇℃伅
+ UserInfoExtra extra = userInfoExtraMapper.getInfoExtraByUid(uid);
+ if (extra != null) {
+ String inviteCodeHas = extra.getInviteCode();
+ if (inviteCodeHas != null && inviteCodeHas.trim().length() > 0) {
+ throw new UserInfoExtraException(1, "宸茬粡婵�娲�, 鏃犻渶鍐嶆婵�娲�");
+ }
+ }
+
+ String wxUnionId = weiXinUser.getUnionid();
+ if (wxUnionId == null || wxUnionId.trim().length() == 0) {
+ throw new UserInfoExtraException(1, "寰俊鎺堟潈澶辫触");
+ }
+
+ // 楠岃瘉鏁版嵁
+ String wxUnionIdExist = invitee.getWxUnionId();
+ if (StringUtil.isNullOrEmpty(wxUnionIdExist)) {
+ UserInfo newUser = userInfoService.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid());
+ if (newUser != null) {
+ throw new UserInfoExtraException(1, "姝ゅ井淇″凡琚叾浠栧笎鍙风粦瀹�");
+ }
+
+ // 鑷姩缁戝畾寰俊
+ UserInfo updateUserInfo = new UserInfo(uid);
+ updateUserInfo.setWxOpenId(weiXinUser.getOpenid());
+ updateUserInfo.setWxUnionId(weiXinUser.getUnionid());
+ updateUserInfo.setWxName(weiXinUser.getNickname());
+ updateUserInfo.setWxPic(weiXinUser.getHeadimgurl());
+
+ // 灏嗛粯璁ゆ樀绉版浛鎹㈡垚寰俊鏄电О
+ String defaultNickName = Constant.systemCommonConfig.getDefaultNickName();
+ if (!StringUtil.isNullOrEmpty(defaultNickName) && !StringUtil.isNullOrEmpty(weiXinUser.getNickname())) {
+ defaultNickName = defaultNickName + uid;
+ if ((defaultNickName.equals(invitee.getNickName()) || "杩斿埄鍒�".equals(invitee.getNickName())
+ || invitee.getNickName().startsWith(Constant.systemCommonConfig.getDefaultNickName()))) {
+ updateUserInfo.setNickName(weiXinUser.getNickname());
+ }
+ }
+
+ // 灏嗛粯璁ゅご鍍忔浛鎹㈡垚寰俊澶村儚
+ String defaultPortrait = Constant.systemCommonConfig.getDefaultPortrait();
+ if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl()) && !StringUtil.isNullOrEmpty(defaultPortrait)
+ && defaultPortrait.equals(invitee.getPortrait())) {
+ String headimgurl = weiXinUser.getHeadimgurl();
+ InputStream asInputStream = HttpUtil.getAsInputStream(headimgurl);
+ if (asInputStream == null) {
+ LogHelper.test("寰俊澶村儚涓嬭浇澶辫触: " +weiXinUser.getUnionid()+ " " + headimgurl);
+ } else {
+ FileUploadResult result = COSManager.getInstance().uploadFile(asInputStream,
+ String.format("/portrait/wx/%s_%s.jpg", weiXinUser.getUnionid(), System.currentTimeMillis() + ""));
+ if (result != null && !StringUtil.isNullOrEmpty(result.getUrl())) {
+ headimgurl = result.getUrl();
+ } else {
+ LogHelper.test("寰俊澶村儚涓婁紶澶辫触: " +weiXinUser.getUnionid()+ " " + headimgurl);
+ }
+ }
+ updateUserInfo.setPortrait(headimgurl);
+ }
+
+ userInfoService.updateByPrimaryKeySelective(updateUserInfo);
+
+ } else if (!wxUnionId.equals(wxUnionIdExist)) {
+ throw new UserInfoExtraException(1, "缁戝畾寰俊涓庢縺娲诲井淇′笉涓�鑷�");
+ }
+
+ // 閭�璇蜂汉ID -1.5.3鏂扮増
+ Long inviterId = userInviteRecordService.getNewestInviterId(wxUnionId);
+
+ // 鍏煎1.5.3 涔嬪墠鐗堟湰
+ ThreeSale threeSale = threeSaleSerivce.getByWorkerId(uid);
+ if (inviterId == null && threeSale != null) {
+ Long bossId = threeSale.getBoss().getId();
+ UserInfoExtra inviterExtra = userInfoExtraMapper.getInfoExtraByUid(bossId);
+ if (inviterExtra != null && inviterExtra.getInviteCode() == null) {
+ // 鏇存柊閭�璇风爜
+ UserInfoExtra inviterInfoExtra = new UserInfoExtra();
+ inviterInfoExtra.setId(inviterExtra.getId());
+ inviterInfoExtra.setInviteCode(UserUtil.getInviteCode(bossId));
+ userInfoExtraMapper.updateByPrimaryKeySelective(inviterInfoExtra);
+ }
+ }
+
+ // 娌℃湁琚個璇疯繃
+ if (inviterId == null && threeSale == null) {
+ throw new UserInfoExtraException(1, "娌℃湁瀵瑰簲鐨勯個璇峰叧绯�");
+ }
+
+ // 缁戝畾鍏崇郴
+ try {
+ threeSaleSerivce.bindRelationshipByWX(invitee, inviterId, threeSale);
+ } catch (ThreeSaleException e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ throw new UserInfoExtraException(1, "鍏崇郴缁戝畾鏃跺け璐�");
+ }
+
+ // 閭�璇风爜鏈夋晥銆佺敓鎴愰個璇风爜
+ String inviteCode = UserUtil.getInviteCode(uid);
if (inviteCode == null || inviteCode.trim().length() == 0) {
throw new UserInfoExtraException(1, "婵�娲荤爜鐢熸垚澶辫触");
}
@@ -508,38 +650,62 @@
@Override
+ public void updateActiveTime(Long uid, Date date) {
+ UserInfoExtra userInfoExtra = new UserInfoExtra();
+ userInfoExtra.setUserInfo(new UserInfo(uid));
+ userInfoExtra.setActiveTime(date);
+ userInfoExtraMapper.updateInfoExtraByUid(userInfoExtra);
+ }
+
+
+ @Override
public UserInfoExtra getUserInfoExtra(Long uid) {
return userInfoExtraMapper.getInfoExtraByUid(uid);
+ }
+
+ @Override
+ public UserInfoExtra getUserALLInfo(Long uid) {
+ return userInfoExtraMapper.gerUserRank(uid);
+ }
+
+
+ @Override
+ public UserInfoExtra getByUidForUpdate(Long uid) {
+ return userInfoExtraMapper.getByUidForUpdate(uid);
+ }
+
+ @Override
+ public void updateGoldCoin(Long id, Integer goldCoin) {
+ userInfoExtraMapper.updateGoldCoin(id, goldCoin);
}
@Override
public UserInfoExtraVO getInfoExtraVOByUid(Long uid) {
return userInfoExtraMapper.getInfoExtraVOByUid(uid);
}
-
-
+
@Override
public String getUserInviteCode(Long uid) throws UserInfoExtraException {
-
+
UserInfoExtra userInfoExtra = userInfoExtraMapper.getInfoExtraByUid(uid);
if (userInfoExtra == null) {
userInfoExtra = new UserInfoExtra();
}
-
+
// 閭�璇风爜
String inviteCode = userInfoExtra.getInviteCode();
-
+
if (inviteCode == null || inviteCode.trim().length() == 0) {
// 鍒ゆ柇鐢ㄦ埛
int relationshipNum = threeSaleSerivce.getSuccessRelationshipNum(uid);
-
+
if (relationshipNum > 0) {
// 閭�璇风爜鏈夋晥銆佺敓鎴愰個璇风爜
- inviteCode = UserUtil.getInviteCode(uid);
+ inviteCode = UserUtil.getInviteCode(uid);
if (inviteCode == null || inviteCode.trim().length() == 0) {
throw new UserInfoExtraException(1, "婵�娲荤爜鐢熸垚澶辫触");
}
-
+
// 淇濆瓨閭�璇风爜
userInfoExtra.setUserInfo(new UserInfo(uid));
userInfoExtra.setInviteCode(inviteCode);
@@ -547,22 +713,22 @@
saveUserInfoExtra(userInfoExtra);
}
}
-
+
return inviteCode;
}
-
+
@Override
public long countByRankId(Long rankId) {
return userInfoExtraMapper.countByRankId(rankId);
}
-
+
@Override
public boolean isNewUser(Long uid) {
boolean isNew = false;
if (uid == null) {
return isNew;
}
-
+
UserInfoExtra extra = userInfoExtraMapper.getInfoExtraByUid(uid);
if (extra != null && extra.getFirstLoginTime() != null) {
try {
@@ -576,25 +742,22 @@
}
return isNew;
}
-
-
+
@Override
public UserRank gerUserRank(Long uid) {
- if(uid == null) {
+ if (uid == null) {
return null;
}
-
+
UserInfoExtra userInfoExtra = userInfoExtraMapper.gerUserRank(uid);
if (userInfoExtra == null) {
return null;
}
return userInfoExtra.getUserRank();
}
-
-
-
+
@Override
- public UserInfo getUserByInviteCode(String inviteCode) throws UserInfoExtraException{
+ public UserInfo getUserByInviteCode(String inviteCode) throws UserInfoExtraException {
if (StringUtil.isNullOrEmpty(inviteCode)) {
throw new UserInfoExtraException(1, "閭�璇风爜涓嶈兘涓虹┖");
}
@@ -605,20 +768,19 @@
}
return inviter;
}
-
-
+
@Override
- public UserInfo getInviterInfo(Long uid, String code) throws UserInfoExtraException{
- if (code == null) {
- throw new UserInfoExtraException(1, "code淇℃伅涓嶅畬鏁�");
+ public UserInfo getInviterInfo(Long uid, String wxUnionId) throws UserInfoExtraException {
+ if (wxUnionId == null) {
+ throw new UserInfoExtraException(1, "unionId淇℃伅涓嶅畬鏁�");
}
-
+
// 鐢ㄦ埛淇℃伅
UserInfo invitee = userInfoService.selectByPKey(uid);
if (invitee == null) {
throw new UserInfoExtraException(1, "鐢ㄦ埛涓嶅瓨鍦�");
}
-
+
// 鐢ㄦ埛棰濆淇℃伅
UserInfoExtra extra = userInfoExtraMapper.getInfoExtraByUid(uid);
if (extra != null) {
@@ -627,38 +789,33 @@
throw new UserInfoExtraException(1, "宸茬粡婵�娲�, 鏃犻渶鍐嶆婵�娲�");
}
}
-
- // 鑾峰彇寰俊淇℃伅
- WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code);
- if (weiXinUser == null) {
- throw new UserInfoExtraException(1, "寰俊鎺堟潈澶辫触");
- }
- String wxUnionId = weiXinUser.getUnionid();
- if (wxUnionId == null || wxUnionId.trim().length() == 0) {
- throw new UserInfoExtraException(1, "寰俊鎺堟潈澶辫触");
- }
-
+
// 楠岃瘉鏁版嵁
String wxUnionIdExist = invitee.getWxUnionId();
if (StringUtil.isNullOrEmpty(wxUnionIdExist)) {
- UserInfo newUser = userInfoService.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid());
+ UserInfo newUser = userInfoService.getEffectiveUserInfoByWXUnionId(wxUnionId);
if (newUser != null) {
throw new UserInfoExtraException(1, "姝ゅ井淇″凡琚叾浠栧笎鍙风粦瀹�");
}
- } else if (!wxUnionId.equals(wxUnionIdExist)){
+ } else if (!wxUnionId.equals(wxUnionIdExist)) {
throw new UserInfoExtraException(1, "缁戝畾寰俊涓庢縺娲诲井淇′笉涓�鑷�");
}
-
+
// 閭�璇蜂汉ID
Long inviterId = userInviteRecordService.getNewestInviterId(wxUnionId);
if (inviterId == null) {
throw new UserInfoExtraException(1, "娌℃湁瀵瑰簲鐨勯個璇峰叧绯�");
}
-
+
UserInfo inviter = userInfoService.selectByPKey(inviterId);
if (inviter == null) {
throw new UserInfoExtraException(1, "瀵瑰簲鐨勯個璇峰叧绯讳笉瀛樺湪");
}
return inviter;
}
+
+ @Override
+ public void updateAutoExtract(Integer days) {
+ userInfoExtraMapper.updateAutoExtract(days);
+ }
}
--
Gitblit v1.8.0