From 6b8ab82d1d7fb9d44d85eeb1dfd2e36d3c28c9cf Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 10 六月 2019 11:30:21 +0800
Subject: [PATCH] 客服消息修改，新版大淘客数据添加
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
index f144b17..8da44ae 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
@@ -677,14 +677,14 @@
updateUserInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName() + user.getId());
userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);
}
-
+
try {
// 绗竴娆＄櫥褰曟椂鍒涘缓鐢ㄦ埛棰濆淇℃伅
userInfoExtraService.createUserInfoExtra(user.getId());
} catch (Exception e) {
e.printStackTrace();
}
-
+
}
@Override
@@ -935,9 +935,10 @@
String oldVcode = redisManager.getSMSVCode(phone, SMSHistory.TYPE_LOGIN);
LogHelper.test("----------------------鐧诲綍楠岃瘉鐮侊細 " + oldVcode);
- if (StringUtil.isNullOrEmpty(oldVcode) || !oldVcode.equalsIgnoreCase(vcode)) {
- throw new UserAccountException(1, "楠岃瘉鐮侀敊璇紝閲嶆柊杈撳叆");
- }
+ if (!Constant.IS_TEST)
+ if (StringUtil.isNullOrEmpty(oldVcode) || !oldVcode.equalsIgnoreCase(vcode)) {
+ throw new UserAccountException(1, "楠岃瘉鐮侀敊璇紝閲嶆柊杈撳叆");
+ }
}
JSONObject logInfo = new JSONObject();
@@ -1013,13 +1014,13 @@
UserInfo userInfo = userInfoMapper.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid());
// 鐩存帴鐢ㄧ殑寰俊鐧诲綍
if (userInfo != null) {
- LogHelper.test("寰俊unionID瀛樺湪:"+weiXinUser.getUnionid());
+ LogHelper.test("寰俊unionID瀛樺湪:" + weiXinUser.getUnionid());
// 鏇存柊璐︽埛鐧诲綍淇℃伅
updateLonginInfo(userInfo, loginType, request);
// 鍒犻櫎閭�璇峰垎浜浘
spreadUserImgService.deleteImgUrl(userInfo.getId());
} else {
- LogHelper.test("寰俊unionID涓嶅瓨鍦�:"+weiXinUser.getUnionid());
+ LogHelper.test("寰俊unionID涓嶅瓨鍦�:" + weiXinUser.getUnionid());
// 鍒涘缓鏂拌处鎴�
userInfo = new UserInfo();
userInfo.setPortrait(weiXinUser.getHeadimgurl());
@@ -1110,12 +1111,12 @@
if (weiXinUser == null) {
throw new UserAccountException(2, "寰俊甯愬彿鎺堟潈澶辫触");
}
-
+
String wxUnionId = weiXinUser.getUnionid();
if (StringUtil.isNullOrEmpty(wxUnionId)) {
throw new UserAccountException(2, "寰俊甯愬彿鎺堟潈澶辫触");
}
-
+
String wxUnionIdExist = user.getWxUnionId();
if (StringUtil.isNullOrEmpty(wxUnionIdExist)) {
UserInfo newUser = userInfoMapper.getEffectiveUserInfoByWXUnionId(wxUnionId);
@@ -1135,14 +1136,19 @@
updateUserInfo.setWxOpenId(weiXinUser.getOpenid());
updateUserInfo.setWxPic(weiXinUser.getHeadimgurl());
updateUserInfo.setWxUnionId(weiXinUser.getUnionid());
- updateUserInfo.setNickName(weiXinUser.getNickname());
- updateUserInfo.setPortrait(weiXinUser.getHeadimgurl());
- if (StringUtil.isNullOrEmpty(weiXinUser.getNickname())) {
- updateUserInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName());
+
+ // 灏嗛粯璁ゆ樀绉版浛鎹㈡垚寰俊鏄电О
+ String defaultNickName = Constant.systemCommonConfig.getDefaultNickName();
+ if (!StringUtil.isNullOrEmpty(weiXinUser.getNickname()) && !StringUtil.isNullOrEmpty(defaultNickName)
+ && defaultNickName.equals(user.getNickName())) {
+ updateUserInfo.setNickName(weiXinUser.getNickname());
}
- if (StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl())) {
- updateUserInfo.setPortrait(Constant.systemCommonConfig.getDefaultPortrait());
+ // 灏嗛粯璁ゅご鍍忔浛鎹㈡垚寰俊澶村儚
+ String defaultPortrait = Constant.systemCommonConfig.getDefaultPortrait();
+ if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl()) && !StringUtil.isNullOrEmpty(defaultPortrait)
+ && defaultPortrait.equals(user.getPortrait())) {
+ updateUserInfo.setPortrait(weiXinUser.getHeadimgurl());
}
userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);
--
Gitblit v1.8.0