From cc55ffcea74c7d23dadaa0860befbcdf98f35341 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期一, 16 九月 2019 23:22:13 +0800
Subject: [PATCH] 资金相关包目录修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java | 95 +++++++++++------------------------------------
1 files changed, 22 insertions(+), 73 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 888c037..0d4b30b 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
@@ -16,13 +16,14 @@
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;
import com.yeshi.fanli.entity.bus.user.UserRank;
import com.yeshi.fanli.entity.bus.user.UserRankRecord;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
-import com.yeshi.fanli.exception.ThreeSaleException;
+import com.yeshi.fanli.exception.user.ThreeSaleException;
import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -384,7 +385,7 @@
@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, "婵�娲讳俊鎭笉瀹屾暣");
}
@@ -405,7 +406,7 @@
}
// 鑾峰彇寰俊淇℃伅
- WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code);
+ WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code,wxAccount.getAppId(),wxAccount.getAppSecret());
if (weiXinUser == null) {
throw new UserInfoExtraException(1, "寰俊鎺堟潈澶辫触");
}
@@ -426,14 +427,25 @@
UserInfo updateUserInfo = new UserInfo(uid);
updateUserInfo.setWxOpenId(weiXinUser.getOpenid());
updateUserInfo.setWxUnionId(weiXinUser.getUnionid());
- if (!StringUtil.isNullOrEmpty(weiXinUser.getNickname())) {
- updateUserInfo.setWxName(weiXinUser.getNickname());
- updateUserInfo.setNickName(weiXinUser.getNickname());
+ 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()))) {
+ updateUserInfo.setNickName(weiXinUser.getNickname());
+ }
}
- if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl())) {
- updateUserInfo.setWxPic(weiXinUser.getHeadimgurl());
+
+ // 灏嗛粯璁ゅご鍍忔浛鎹㈡垚寰俊澶村儚
+ String defaultPortrait = Constant.systemCommonConfig.getDefaultPortrait();
+ if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl()) && !StringUtil.isNullOrEmpty(defaultPortrait)
+ && defaultPortrait.equals(invitee.getPortrait())) {
updateUserInfo.setPortrait(weiXinUser.getHeadimgurl());
}
+
userInfoService.updateByPrimaryKeySelective(updateUserInfo);
} else if (!wxUnionId.equals(wxUnionIdExist)){
@@ -597,7 +609,7 @@
@Override
- public UserInfo getInviterInfo(Long uid, String code) throws UserInfoExtraException{
+ public UserInfo getInviterInfo(WXAccountInfoDTO wxAccount,Long uid, String code) throws UserInfoExtraException{
if (code == null) {
throw new UserInfoExtraException(1, "code淇℃伅涓嶅畬鏁�");
}
@@ -618,7 +630,7 @@
}
// 鑾峰彇寰俊淇℃伅
- WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code);
+ WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code,wxAccount.getAppId(),wxAccount.getAppSecret());
if (weiXinUser == null) {
throw new UserInfoExtraException(1, "寰俊鎺堟潈澶辫触");
}
@@ -649,68 +661,5 @@
throw new UserInfoExtraException(1, "瀵瑰簲鐨勯個璇峰叧绯讳笉瀛樺湪");
}
return inviter;
- }
-
-
-
- @Override
- public String activateUser(Long uid, String inviteUid) throws UserInfoExtraException{
- if (uid == null || inviteUid == null) {
- throw new UserInfoExtraException(1, "浼犻�抜d涓嶈兘涓虹┖");
- }
-
- // 琚個璇蜂汉淇℃伅
- 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, "宸插瓨鍦ㄩ個璇风爜,璇峰埛鏂伴〉闈�");
- }
- }
-
- // 閭�璇蜂汉淇℃伅
- UserInfo inviter = userInfoService.getInfoByPhoneOrInviteCode(inviteCode, inviteCode);
- if (inviter == null) {
- throw new UserInfoExtraException(1, "涓婄骇閭�璇风爜涓嶅瓨鍦�");
- }
-
- // 缁戝畾鍏崇郴
- try {
- threeSaleSerivce.bindRelationshipByInviteCode(invitee, inviter);
- } catch (ThreeSaleException e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- throw new UserInfoExtraException(1, "婵�娲诲け璐�");
- }
-
-
- // 閭�璇风爜鏈夋晥銆佺敓鎴愰個璇风爜
- 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;
}
}
--
Gitblit v1.8.0