From 245f369b980e7d6f34a5a1aa9fb0bdaba1f63f5f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 02 九月 2019 14:20:29 +0800
Subject: [PATCH] 京东/拼多多维权订单修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 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 e0d3640..34dce2f 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
@@ -697,8 +697,9 @@
user.setRank(0);
if (StringUtil.isNullOrEmpty(user.getPortrait()))
user.setPortrait(Constant.systemCommonConfig.getDefaultPortrait());
-
userInfoMapper.insertSelective(user);
+
+ // 鏄电О涓虹┖鏃� 榛樿鏄电О
if (StringUtil.isNullOrEmpty(user.getNickName())) {
UserInfo updateUserInfo = new UserInfo(user.getId());
updateUserInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName() + user.getId());
@@ -848,15 +849,23 @@
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(defaultNickName) && !StringUtil.isNullOrEmpty(weiXinUser.getNickname())) {
+ defaultNickName = defaultNickName + uid;
+ if ((defaultNickName.equals(user.getNickName()) || "杩斿埄鍒�".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);
userAccountMsgNotificationService.changeBindingSuccess(uid, MsgAccountDetailFactory.TYPE_WX);
@@ -1023,7 +1032,7 @@
} else {
userInfo = new UserInfo();
userInfo.setAppId(appId);
- userInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName());
+ //userInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName());
userInfo.setPortrait(Constant.systemCommonConfig.getDefaultPortrait());
userInfo.setPhone(phone);
userInfo.setLoginType(loginType);
@@ -1234,11 +1243,13 @@
// 灏嗛粯璁ゆ樀绉版浛鎹㈡垚寰俊鏄电О
String defaultNickName = Constant.systemCommonConfig.getDefaultNickName();
- if (!StringUtil.isNullOrEmpty(weiXinUser.getNickname()) && !StringUtil.isNullOrEmpty(defaultNickName)
- && defaultNickName.equals(user.getNickName())) {
- updateUserInfo.setNickName(weiXinUser.getNickname());
+ if (!StringUtil.isNullOrEmpty(defaultNickName) && !StringUtil.isNullOrEmpty(weiXinUser.getNickname())) {
+ defaultNickName = defaultNickName + uid;
+ if ((defaultNickName.equals(user.getNickName()) || "杩斿埄鍒�".equals(user.getNickName()))) {
+ updateUserInfo.setNickName(weiXinUser.getNickname());
+ }
}
-
+
// 灏嗛粯璁ゅご鍍忔浛鎹㈡垚寰俊澶村儚
String defaultPortrait = Constant.systemCommonConfig.getDefaultPortrait();
if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl()) && !StringUtil.isNullOrEmpty(defaultPortrait)
--
Gitblit v1.8.0