From 30d8e227e8d823b6c38c3b9c90ac2df03b63befe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 二月 2025 16:41:22 +0800
Subject: [PATCH] 淘宝转链接口更新
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java | 82 ++++++++++++++++++++++++++++------------
1 files changed, 57 insertions(+), 25 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 9b5ac8e..3e8adb6 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
@@ -12,6 +12,7 @@
import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.service.inter.config.ConfigService;
+import com.yeshi.fanli.service.inter.config.SystemConfigService;
import com.yeshi.fanli.util.*;
import com.yeshi.fanli.vo.taobao.TaoBaoUser;
import com.yeshi.fanli.vo.user.QQUserInfoVO;
@@ -106,6 +107,10 @@
@Resource
private UserInfoModifyRecordService userInfoModifyRecordService;
+
+ @Resource
+ private SystemConfigService systemConfigService;
+
@Transactional(rollbackFor = Exception.class)
@Override
public LoginResult login(HttpServletRequest request, AcceptData acceptData, Boolean first, String appId,
@@ -125,6 +130,9 @@
if (first != null && first == true) {
session.removeAttribute("LAST_LOGIN_USER");
}
+
+ String defaultPortrait = userInfoService.getDefaultPortrait(acceptData.getSystem());
+
// 浼氳瘽涓笂娆＄櫥褰曠殑鐢ㄦ埛
if (wxinstall) {// 瀹夎浜嗗井淇＄殑鐘舵��
UserInfo lastUser = (UserInfo) session.getAttribute("LAST_LOGIN_USER");
@@ -330,8 +338,8 @@
if (userInfo == null) {// 鍘熷厛鐨勮处鍙蜂笉瀛樺湪
userInfo = new UserInfo();
userInfo.setAppId(appId);
- userInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName());
- userInfo.setPortrait(Constant.systemCommonConfig.getDefaultPortrait());
+ userInfo.setNickName(null);
+ userInfo.setPortrait(defaultPortrait);
userInfo.setPhone(phone);
userInfo.setLoginType(loginType);
userInfo.setSystem(SystemInfoUtil.getSystem(acceptData));
@@ -374,6 +382,8 @@
logInfo.put("tbUserInfo", tbUserInfo.getId());
logInfo.put("loginType", loginType);
LogHelper.lgoinInfo(logInfo.toString());
+
+ String defaultPortrait = userInfoService.getDefaultPortrait(acceptData.getSystem());
UserInfo userInfo = null;
WeiXinUser weiXinUser = null;
@@ -442,8 +452,8 @@
break;
case 3:// 鎵嬫満鍙风爜
// 榛樿澶村儚涓庢樀绉�
- userInfo.setPortrait(Constant.systemCommonConfig.getDefaultPortrait());
- userInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName());
+ userInfo.setPortrait(defaultPortrait);
+ userInfo.setNickName(null);
userInfo.setPhone(phone);
break;
}
@@ -576,13 +586,16 @@
public void addUser(UserInfo user) {
user.setCreatetime(System.currentTimeMillis());
user.setRank(0);
- if (StringUtil.isNullOrEmpty(user.getPortrait()))
- user.setPortrait(Constant.systemCommonConfig.getDefaultPortrait());
+ if (StringUtil.isNullOrEmpty(user.getPortrait())) {
+ String defaultPortrait = userInfoService.getDefaultPortrait(user.getSystem());
+ user.setPortrait(defaultPortrait);
+ }
userInfoService.createUser(user, user.getSystem());
// 鏄电О涓虹┖鏃� 榛樿鏄电О
if (StringUtil.isNullOrEmpty(user.getNickName())) {
UserInfo updateUserInfo = new UserInfo(user.getId());
- updateUserInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName() + user.getId());
+ String defaultNickName = userInfoService.getDefaultNickName(user.getSystem(), user.getId());
+ updateUserInfo.setNickName(defaultNickName);
userInfoService.updateByPrimaryKeySelective(updateUserInfo);
}
@@ -696,8 +709,8 @@
update.setTbPic("");
// 鍒ゆ柇鏄惁鏈夊井淇＄粦瀹�
if (StringUtil.isNullOrEmpty(user.getWxUnionId())) {
- update.setNickName(Constant.systemCommonConfig.getDefaultNickName() + user.getId());
- update.setPortrait(Constant.systemCommonConfig.getDefaultPortrait());
+ update.setNickName(userInfoService.getDefaultNickName(user.getSystem(), user.getId()));
+ update.setPortrait(userInfoService.getDefaultPortrait(user.getSystem()));
}
userInfoService.updateByPrimaryKeySelective(update);
@@ -731,16 +744,15 @@
updateUserInfo.setWxUnionId(weiXinUser.getUnionid());
// 灏嗛粯璁ゆ樀绉版浛鎹㈡垚寰俊鏄电О
- String defaultNickName = Constant.systemCommonConfig.getDefaultNickName();
- if (!StringUtil.isNullOrEmpty(defaultNickName) && !StringUtil.isNullOrEmpty(weiXinUser.getNickname())) {
- defaultNickName = defaultNickName + uid;
+ if (!StringUtil.isNullOrEmpty(weiXinUser.getNickname())) {
+ String defaultNickName = userInfoService.getDefaultNickName(user.getSystem(), uid);
if ((defaultNickName.equals(user.getNickName()) || "鏉挎牀蹇渷".equals(user.getNickName()))) {
updateUserInfo.setNickName(weiXinUser.getNickname());
}
}
// 灏嗛粯璁ゅご鍍忔浛鎹㈡垚寰俊澶村儚
- String defaultPortrait = Constant.systemCommonConfig.getDefaultPortrait();
+ String defaultPortrait = userInfoService.getDefaultPortrait(user.getSystem());
if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl()) && !StringUtil.isNullOrEmpty(defaultPortrait)
&& defaultPortrait.equals(user.getPortrait())) {
updateUserInfo.setPortrait(weiXinUser.getHeadimgurl());
@@ -803,6 +815,8 @@
@Override
public String getMobile(String vcode, String phone, String aliAccessToken, SystemEnum system, int vcodeType) throws UserAccountException {
if (!StringUtil.isNullOrEmpty(aliAccessToken)) {
+
+
String mobile = AliyunOneKeyLoginUtil.getMobile(aliAccessToken, "");
if (StringUtil.isNullOrEmpty(mobile)) {
throw new UserAccountException(1, "鎵嬫満鍙疯幏鍙栧け璐�");
@@ -891,7 +905,7 @@
} else {
userInfo = new UserInfo();
userInfo.setAppId(businessSystem.getAppid());
- userInfo.setPortrait(Constant.systemCommonConfig.getDefaultPortrait());
+ userInfo.setPortrait(null);
userInfo.setPhone(mobile);
userInfo.setLoginType(loginType);
userInfo.setState(UserInfo.STATE_NORMAL);
@@ -1100,7 +1114,7 @@
}
if (StringUtil.isNullOrEmpty(portrait))
- portrait = Constant.systemCommonConfig.getDefaultPortrait();
+ portrait = userInfoService.getDefaultPortrait(businessSystem.getSystem());
// 鍒涘缓鏂拌处鎴�
userInfo = new UserInfo();
@@ -1320,7 +1334,7 @@
updateUserInfo.setWxUnionId(weiXinUser.getUnionid());
// 灏嗛粯璁ゆ樀绉版浛鎹㈡垚寰俊鏄电О
- String defaultNickName = Constant.systemCommonConfig.getDefaultNickName();
+ String defaultNickName = userInfoService.getDefaultNickName(user.getSystem(), user.getId());
if (!StringUtil.isNullOrEmpty(defaultNickName) && !StringUtil.isNullOrEmpty(weiXinUser.getNickname())) {
defaultNickName = defaultNickName + uid;
if ((defaultNickName.equals(user.getNickName()) || "鏉挎牀蹇渷".equals(user.getNickName()))) {
@@ -1329,7 +1343,7 @@
}
// 灏嗛粯璁ゅご鍍忔浛鎹㈡垚寰俊澶村儚
- String defaultPortrait = Constant.systemCommonConfig.getDefaultPortrait();
+ String defaultPortrait = userInfoService.getDefaultPortrait(user.getSystem());
if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl()) && !StringUtil.isNullOrEmpty(defaultPortrait)
&& defaultPortrait.equals(user.getPortrait())) {
String headimgurl = weiXinUser.getHeadimgurl();
@@ -1400,7 +1414,7 @@
updateUserInfo.setQqOpenId(qqUser.getOpenid());
// 灏嗛粯璁ゆ樀绉版浛鎹㈡垚寰俊鏄电О
- String defaultNickName = Constant.systemCommonConfig.getDefaultNickName();
+ String defaultNickName = userInfoService.getDefaultNickName(user.getSystem(), user.getId());
if (!StringUtil.isNullOrEmpty(defaultNickName) && !StringUtil.isNullOrEmpty(qqUser.getNickname())) {
defaultNickName = defaultNickName + uid;
if ((defaultNickName.equals(user.getNickName()) || "鏉挎牀蹇渷".equals(user.getNickName()))) {
@@ -1409,7 +1423,7 @@
}
// 灏嗛粯璁ゅご鍍忔浛鎹㈡垚QQ澶村儚
- String defaultPortrait = Constant.systemCommonConfig.getDefaultPortrait();
+ String defaultPortrait = userInfoService.getDefaultPortrait(user.getSystem());
if (!StringUtil.isNullOrEmpty(qqUser.getFigureurl_2()) && !StringUtil.isNullOrEmpty(defaultPortrait)
&& defaultPortrait.equals(user.getPortrait())) {
String headimgurl = qqUser.getFigureurl_2();
@@ -1519,9 +1533,9 @@
}
}
- if (StringUtil.isNullOrEmpty(portrait))
- portrait = Constant.systemCommonConfig.getDefaultPortrait();
-
+ if (StringUtil.isNullOrEmpty(portrait)) {
+ portrait = userInfoService.getDefaultPortrait(system);
+ }
// 鏄惁闇�瑕佸垱寤烘柊璐︽埛
UserInfo phoneUser = userInfoService.getEffectiveUserInfoByPhone(phone, system);
UserInfo userInfo = null;
@@ -1683,9 +1697,9 @@
}
}
- if (StringUtil.isNullOrEmpty(portrait))
- portrait = Constant.systemCommonConfig.getDefaultPortrait();
-
+ if (StringUtil.isNullOrEmpty(portrait)) {
+ portrait = userInfoService.getDefaultPortrait(system);
+ }
// 鍒涘缓鏂拌处鎴�
userInfo = new UserInfo();
userInfo.setPhone(phone);
@@ -1807,6 +1821,24 @@
}
@Override
+ public void unRegisterUser(Long uid,String reason) {
+ UserInfo currentInfo = userInfoService.selectByPKey(uid);
+ if (currentInfo == null) {
+ return;
+ }
+ if (currentInfo.getState() != UserInfo.STATE_NORMAL) {
+ return;
+ }
+
+ currentInfo.setState(UserInfo.STATE_FORBIDDEN);
+ currentInfo.setStateDesc(reason);
+ userInfoService.updateByPrimaryKeySelective(currentInfo);
+
+ // 鎻掑叆璁板綍
+ userInfoDeleteRecordService.addDeleteRecord(uid, UserInfo.STATE_DELETE, reason);
+ }
+
+ @Override
public void forbiddenUser(Long uid, String reason) {
UserInfo currentInfo = userInfoService.selectByPKey(uid);
if (currentInfo == null) {
--
Gitblit v1.8.0