From 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 20:19:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/UserTeamMessageListener.java | 46 ++++++++++++++++++++++------------------------
1 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/UserTeamMessageListener.java b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/UserTeamMessageListener.java
index fdc3bc2..d9a717c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/UserTeamMessageListener.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/UserTeamMessageListener.java
@@ -18,8 +18,8 @@
import com.yeshi.fanli.dto.mq.user.body.UserInviteMQMsg;
import com.yeshi.fanli.dto.mq.user.body.UserMoneyChangeMQMsg;
import com.yeshi.fanli.log.LogHelper;
-import com.yeshi.fanli.service.inter.user.invite.ThreeSaleFocusInfoService;
-import com.yeshi.fanli.service.inter.user.vip.TeamLevelDailyRecordService;
+import com.yeshi.fanli.service.inter.user.invite.TeamFansInfoService;
+import com.yeshi.fanli.service.inter.user.invite.ThreeSaleDetailService;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
import net.sf.json.JSONObject;
@@ -34,11 +34,11 @@
public class UserTeamMessageListener implements MessageListener {
@Resource
- private ThreeSaleFocusInfoService threeSaleFocusInfoService;
-
+ private TeamFansInfoService teamFansInfoService;
+
@Resource
- private TeamLevelDailyRecordService teamLevelDailyRecordService;
-
+ private ThreeSaleDetailService threeSaleDetailService;
+
@Override
public Action consume(Message message, ConsumeContext context) {
@@ -53,57 +53,55 @@
if (MQTopicName.TOPIC_USER.name().equalsIgnoreCase(message.getTopic())) {
if (tag.equalsIgnoreCase(UserTopicTagEnum.userActve.name())) {// 鐢ㄦ埛娲昏穬
JSONObject json = JSONObject.fromObject(new String(message.getBody()));
- UserActiveMQMsg userActiveMQMsg = new Gson().fromJson(json.toString(),UserActiveMQMsg.class);
+ UserActiveMQMsg userActiveMQMsg = new Gson().fromJson(json.toString(), UserActiveMQMsg.class);
if (userActiveMQMsg != null) {
// 鏇存敼鐢ㄦ埛娲昏穬鏃堕棿
- threeSaleFocusInfoService.updateActiveTime(userActiveMQMsg.getUid(), userActiveMQMsg.getCreateTime());
+ teamFansInfoService.updateActiveTime(userActiveMQMsg.getUid(), userActiveMQMsg.getCreateTime());
}
} else if (tag.equalsIgnoreCase(UserTopicTagEnum.userInfoUpdate.name())) {// 鐢ㄦ埛淇℃伅鏇存柊
JSONObject json = JSONObject.fromObject(new String(message.getBody()));
- UserInfoUpdateMQMsg mqMsg = new Gson().fromJson(json.toString(),UserInfoUpdateMQMsg.class);
+ UserInfoUpdateMQMsg mqMsg = new Gson().fromJson(json.toString(), UserInfoUpdateMQMsg.class);
if (mqMsg != null) {
if (UserInfoUpdateTypeEnum.nickName == mqMsg.getType()) { // 鏇存敼鏄电О
- threeSaleFocusInfoService.updateNickName(mqMsg.getUid(), mqMsg.getValue());
+ teamFansInfoService.updateNickName(mqMsg.getUid(), mqMsg.getValue());
} else if (UserInfoUpdateTypeEnum.wxId == mqMsg.getType()) { // 寰俊鍙风粦瀹�
- threeSaleFocusInfoService.updateWeixinBind(mqMsg.getUid(), true);
+ teamFansInfoService.updateWeixinBind(mqMsg.getUid(), true);
}
}
} else if (tag.equalsIgnoreCase(UserTopicTagEnum.taobaoBindSuccess.name())) {// 娣樺疂缁戝畾鎴愬姛
- // 鏇存敼娣樺疂缁戝畾鐘舵�佷笌鍘熺敤鎴锋窐瀹濈粦瀹氱姸鎬�
+ // 鏇存敼娣樺疂缁戝畾鐘舵�佷笌鍘熺敤鎴锋窐瀹濈粦瀹氱姸鎬�
JSONObject json = JSONObject.fromObject(new String(message.getBody()));
- TaoBaoBindSuccessMQMsg mqMsg = new Gson().fromJson(json.toString(),TaoBaoBindSuccessMQMsg.class);
+ TaoBaoBindSuccessMQMsg mqMsg = new Gson().fromJson(json.toString(), TaoBaoBindSuccessMQMsg.class);
if (mqMsg != null) {
// 鏇存柊娣樺疂缁戝畾
- threeSaleFocusInfoService.updateWeixinBind(mqMsg.getUid(), true);
+ teamFansInfoService.updateWeixinBind(mqMsg.getUid(), true);
Long fromUid = mqMsg.getFromUid();
if (fromUid != null) { // 娣樺疂琚В缁�
- threeSaleFocusInfoService.updateWeixinBind(fromUid, false);
+ teamFansInfoService.updateWeixinBind(fromUid, false);
}
}
} else if (tag.equalsIgnoreCase(UserTopicTagEnum.inviteSuccess.name())) {// 閭�璇锋垚鍔�
// 鏇存柊绮変笣鏁伴噺
JSONObject json = JSONObject.fromObject(new String(message.getBody()));
- UserInviteMQMsg mqMsg = new Gson().fromJson(json.toString(),UserInviteMQMsg.class);
+ UserInviteMQMsg mqMsg = new Gson().fromJson(json.toString(), UserInviteMQMsg.class);
if (mqMsg != null) {
- threeSaleFocusInfoService.updateFansNum(mqMsg.getBossId());
-
- // 閲嶆柊缁熻绮変笣绛夌骇鏁伴噺
- teamLevelDailyRecordService.addStatisticByUid(mqMsg.getBossId());
+ teamFansInfoService.updateFansNum(mqMsg.getBossId());
+ threeSaleDetailService.addByWorkerUid(mqMsg.getWorkerId());
}
} else if (tag.equalsIgnoreCase(UserTopicTagEnum.userMoneyAdd.name())) {// 璧勯噾鍒拌处
// 鏇存柊杩�60澶╁埌璐�
JSONObject json = JSONObject.fromObject(new String(message.getBody()));
- UserMoneyChangeMQMsg mqMsg = new Gson().fromJson(json.toString(),UserMoneyChangeMQMsg.class);
+ UserMoneyChangeMQMsg mqMsg = new Gson().fromJson(json.toString(), UserMoneyChangeMQMsg.class);
if (mqMsg != null) {
- threeSaleFocusInfoService.updateIncome(mqMsg.getUid(), mqMsg.getChangeMoney());
+ teamFansInfoService.updateIncome(mqMsg.getUid(), mqMsg.getChangeMoney());
}
} else if (tag.equalsIgnoreCase(UserTopicTagEnum.becomeValidUser.name())) {// 鎴愪负鏈夋晥鐢ㄦ埛
// 鏈夋晥鐢ㄦ埛鏍囪瘑
JSONObject json = JSONObject.fromObject(new String(message.getBody()));
- BeComeValidUserMQMsg mqMsg = new Gson().fromJson(json.toString(),BeComeValidUserMQMsg.class);
+ BeComeValidUserMQMsg mqMsg = new Gson().fromJson(json.toString(), BeComeValidUserMQMsg.class);
if (mqMsg != null) {
// 鏇存柊鎴愪负鏈夋晥绮変笣
- threeSaleFocusInfoService.updateStateValid(mqMsg.getUid(), true);
+ teamFansInfoService.updateStateValid(mqMsg.getUid(), true);
}
}
}
--
Gitblit v1.8.0