From 81da61b828e29b7745e1382dfbbaeb685dc083ef Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 23 一月 2024 17:17:55 +0800
Subject: [PATCH] 抖音转链修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 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 d1fa98f..eb98d63 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
@@ -17,7 +17,9 @@
import com.yeshi.fanli.dao.user.UserGoodsChannelConfigDao;
import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.entity.config.SystemConfigKeyEnum;
import com.yeshi.fanli.entity.goods.UserGoodsChannelConfig;
+import com.yeshi.fanli.service.inter.config.SystemConfigService;
import com.yeshi.fanli.util.*;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -92,12 +94,6 @@
private UserInfoService userInfoService;
@Resource
- private UserAccountService userAccountService;
-
- @Resource
- private ForbiddenUserIdentifyCodeService forbiddenUserIdentifyCodeService;
-
- @Resource
private UserInviteRecordService userInviteRecordService;
@Resource
@@ -109,6 +105,9 @@
@Resource
private RocketMQManager rocketMQManager;
+
+ @Resource
+ private SystemConfigService systemConfigService;
@Override
public UserInfoExtraVO getRankInfo(Long uid) throws UserInfoExtraException, Exception {
@@ -410,17 +409,17 @@
updateUserInfo.setWxPic(weiXinUser.getHeadimgurl());
// 灏嗛粯璁ゆ樀绉版浛鎹㈡垚寰俊鏄电О
- String defaultNickName = Constant.systemCommonConfig.getDefaultNickName();
+ String defaultNickName = systemConfigService.getValueCache(SystemConfigKeyEnum.defaultNickNamePrefix, invitee.getSystem());
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()))) {
+ || invitee.getNickName().startsWith(defaultNickName))) {
updateUserInfo.setNickName(weiXinUser.getNickname());
}
}
// 灏嗛粯璁ゅご鍍忔浛鎹㈡垚寰俊澶村儚
- String defaultPortrait = Constant.systemCommonConfig.getDefaultPortrait();
+ String defaultPortrait = systemConfigService.getValueCache(SystemConfigKeyEnum.defaultPortrait, invitee.getSystem());
if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl()) && !StringUtil.isNullOrEmpty(defaultPortrait)
&& defaultPortrait.equals(invitee.getPortrait())) {
String headimgurl = weiXinUser.getHeadimgurl();
@@ -494,17 +493,17 @@
updateUserInfo.setWxPic(weiXinUser.getHeadimgurl());
// 灏嗛粯璁ゆ樀绉版浛鎹㈡垚寰俊鏄电О
- String defaultNickName = Constant.systemCommonConfig.getDefaultNickName();
+ String defaultNickName = systemConfigService.getValueCache(SystemConfigKeyEnum.defaultNickNamePrefix, invitee.getSystem());
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()))) {
+ || invitee.getNickName().startsWith(defaultNickName))) {
updateUserInfo.setNickName(weiXinUser.getNickname());
}
}
// 灏嗛粯璁ゅご鍍忔浛鎹㈡垚寰俊澶村儚
- String defaultPortrait = Constant.systemCommonConfig.getDefaultPortrait();
+ String defaultPortrait = systemConfigService.getValueCache(SystemConfigKeyEnum.defaultPortrait, invitee.getSystem());
if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl()) && !StringUtil.isNullOrEmpty(defaultPortrait)
&& defaultPortrait.equals(invitee.getPortrait())) {
String headimgurl = weiXinUser.getHeadimgurl();
--
Gitblit v1.8.0