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 | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 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 4a39ecf..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; @@ -55,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; @@ -107,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 { @@ -118,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(); @@ -395,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, "姝ゅ井淇″凡琚叾浠栧笎鍙风粦瀹�"); } @@ -479,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,7 +592,7 @@ if (!Constant.IS_TEST) { // 鍙戦�佹縺娲绘垚鍔熸秷鎭� Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.inviteCodeActive, new InviteCodeActiveMQMsg(uid, new Date())); - producer.send(message); + rocketMQManager.sendNormalMsg(message, null); } return inviteCode; @@ -771,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, "姝ゅ井淇″凡琚叾浠栧笎鍙风粦瀹�"); } @@ -838,7 +839,7 @@ Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.userInfoUpdate, new UserInfoUpdateMQMsg(uid, UserInfoUpdateTypeEnum.inviteCode, inviteCodeVip, new Date())); - producer.send(message); + rocketMQManager.sendNormalMsg(message, null); } // 娑堟伅 -- Gitblit v1.8.0