From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java | 38 +++++++++++++++++---------------------
1 files changed, 17 insertions(+), 21 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 932de4d..f0472aa 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
@@ -15,6 +15,8 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.util.*;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -27,7 +29,6 @@
import com.aliyun.openservices.ons.api.Message;
import com.aliyun.openservices.ons.api.Producer;
-import com.google.gson.Gson;
import com.yeshi.fanli.dao.mybatis.user.UserInfoExtraMapper;
import com.yeshi.fanli.dao.mybatis.user.UserRankRecordMapper;
import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum;
@@ -56,10 +57,7 @@
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.msg.UserAccountMsgNotificationService;
import com.yeshi.fanli.service.inter.user.notify.UserActivedRecordService;
-import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.FilePathEnum;
-import com.yeshi.fanli.util.InviteCodeFilterUtil;
-import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.service.manger.msg.RocketMQManager;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
@@ -108,8 +106,8 @@
@Resource
private UserAccountMsgNotificationService userAccountMsgNotificationService;
- @Resource(name = "producer")
- private Producer producer;
+ @Resource
+ private RocketMQManager rocketMQManager;
@Override
public UserInfoExtraVO getRankInfo(Long uid) throws UserInfoExtraException, Exception {
@@ -119,11 +117,13 @@
throw new UserInfoExtraException(1, "鐢ㄦ埛闄勫姞淇℃伅涓嶅瓨鍦�");
}
+ SystemEnum system= userInfoService.getUserSystem(uid);
+
// 绛夌骇瀵圭収琛�
- String contrast = configService.get(ConfigKeyEnum.userRankContrast.getKey());
+ String contrast = configService.getValue(ConfigKeyEnum.userRankContrast.getKey(),system);
extraVO.setRankContrast(contrast);
// 鐗瑰埆鎻愰啋
- String rankTip = configService.get(ConfigKeyEnum.userRankTip.getKey());
+ String rankTip = configService.getValue(ConfigKeyEnum.userRankTip.getKey(),system);
extraVO.setRankTip(rankTip);
Integer rankOrderNum = extraVO.getRankOrderNum();
@@ -396,7 +396,7 @@
// 楠岃瘉鏁版嵁
String wxUnionIdExist = invitee.getWxUnionId();
if (StringUtil.isNullOrEmpty(wxUnionIdExist)) {
- UserInfo newUser = userInfoService.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid());
+ UserInfo newUser = userInfoService.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid(),invitee.getSystem());
if (newUser != null) {
throw new UserInfoExtraException(1, "姝ゅ井淇″凡琚叾浠栧笎鍙风粦瀹�");
}
@@ -480,7 +480,7 @@
// 楠岃瘉鏁版嵁
String wxUnionIdExist = invitee.getWxUnionId();
if (StringUtil.isNullOrEmpty(wxUnionIdExist)) {
- UserInfo newUser = userInfoService.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid());
+ UserInfo newUser = userInfoService.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid(),invitee.getSystem());
if (newUser != null) {
throw new UserInfoExtraException(1, "姝ゅ井淇″凡琚叾浠栧笎鍙风粦瀹�");
}
@@ -591,8 +591,8 @@
if (!Constant.IS_TEST) { // 鍙戦�佹縺娲绘垚鍔熸秷鎭�
Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.inviteCodeActive,
- new Gson().toJson(new InviteCodeActiveMQMsg(uid, new Date())));
- producer.send(message);
+ new InviteCodeActiveMQMsg(uid, new Date()));
+ rocketMQManager.sendNormalMsg(message, null);
}
return inviteCode;
@@ -772,7 +772,7 @@
// 楠岃瘉鏁版嵁
String wxUnionIdExist = invitee.getWxUnionId();
if (StringUtil.isNullOrEmpty(wxUnionIdExist)) {
- UserInfo newUser = userInfoService.getEffectiveUserInfoByWXUnionId(wxUnionId);
+ UserInfo newUser = userInfoService.getEffectiveUserInfoByWXUnionId(wxUnionId,invitee.getSystem());
if (newUser != null) {
throw new UserInfoExtraException(1, "姝ゅ井淇″凡琚叾浠栧笎鍙风粦瀹�");
}
@@ -798,10 +798,6 @@
return inviter;
}
- @Override
- public void updateAutoExtract(Integer days) {
- userInfoExtraMapper.updateAutoExtract(days);
- }
@Transactional(rollbackFor = Exception.class)
@Override
@@ -841,9 +837,9 @@
if (!Constant.IS_TEST) { // 鍙戦�侀個璇风爜鏇存敼鎴愬姛鐨勬秷鎭�
Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.userInfoUpdate,
- new Gson().toJson(new UserInfoUpdateMQMsg(uid, UserInfoUpdateTypeEnum.inviteCode, inviteCodeVip,
- new Date())));
- producer.send(message);
+ new UserInfoUpdateMQMsg(uid, UserInfoUpdateTypeEnum.inviteCode, inviteCodeVip,
+ new Date()));
+ rocketMQManager.sendNormalMsg(message, null);
}
// 娑堟伅
--
Gitblit v1.8.0