From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息
---
fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/redpack/RedPackMessageListener.java | 98 ++++++++++++++++++++-----------------------------
1 files changed, 40 insertions(+), 58 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/redpack/RedPackMessageListener.java b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/redpack/RedPackMessageListener.java
index 30be42b..c739be7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/redpack/RedPackMessageListener.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/redpack/RedPackMessageListener.java
@@ -14,7 +14,6 @@
import com.yeshi.fanli.dto.mq.order.body.OrderMQMsg;
import com.yeshi.fanli.dto.mq.order.body.OrderMoneyRecievedMQMsg;
import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum;
-import com.yeshi.fanli.dto.mq.user.body.IntegralTaskMQMsg;
import com.yeshi.fanli.dto.mq.user.body.UserAccountBindingMQMsg;
import com.yeshi.fanli.dto.mq.user.body.UserInviteMQMsg;
import com.yeshi.fanli.dto.mq.user.body.UserRedPackGiftMQMsg;
@@ -56,28 +55,8 @@
tag = "";
if (MQTopicName.TOPIC_ORDER.name().equalsIgnoreCase(message.getTopic())) {
- if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderFanLiActual.name())) {// 杩斿埄鍒拌处
- OrderMoneyRecievedMQMsg orderMoneyRecievedMQMsg = new Gson().fromJson(new String(message.getBody()),
- OrderMoneyRecievedMQMsg.class);
- // 鍒嗕韩璁㈠崟濂栧姳
- if (orderMoneyRecievedMQMsg.getType() == OrderMoneyRecievedMQMsg.TYPE_SHARE) {
- // try {
- // redPackWinInviteService.orderArriveReward(orderMoneyRecievedMQMsg.getUid(),
- // orderMoneyRecievedMQMsg.getSourceType(),
- // orderMoneyRecievedMQMsg.getOrderId());
- // } catch (Exception e) {
- // e.printStackTrace();
- // }
- }
- } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderStatistic.name())) {// 璁㈠崟缁熻
+ if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderStatistic.name())) {// 璁㈠崟缁熻
OrderMQMsg orderMQMsg = new Gson().fromJson(new String(message.getBody()), OrderMQMsg.class);
- if (orderMQMsg.isValid()) {
- try {// 閭�璇峰鍔�
- redPackWinInviteService.inviteSucceedReward(orderMQMsg.getUid());
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
// 鍙戦��24灏忔椂寤舵椂娑堟伅
// 娴嬭瘯鏃跺彂閫�
int hour = 24;
@@ -93,31 +72,39 @@
msg.setStartDeliverTime(System.currentTimeMillis() + 1000 * 60);
producer.send(msg);
return Action.CommitMessage;
- }
-
- } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderStatisticDelay.name())) {// 璁㈠崟缁熻
- OrderMQMsg orderMQMsg = new Gson().fromJson(new String(message.getBody()), OrderMQMsg.class);
- int hour = 24;
- if (Constant.IS_TEST) {
- hour = 1;
- }
-
- if (orderMQMsg.getDelayHour() == hour) {
- // TODO 澶勭悊寤舵椂娑堟伅
- }
- return Action.CommitMessage;
- } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderFanLiSeparateByOrderNo.name())) {// 璁㈠崟鍒拌处锛堟寜璁㈠崟鍙峰鐞嗭級
- OrderMoneyRecievedMQMsg orderMoneyRecievedMQMsg = new Gson().fromJson(new String(message.getBody()),
- OrderMoneyRecievedMQMsg.class);
- if (orderMoneyRecievedMQMsg.getType() == OrderMoneyRecievedMQMsg.TYPE_ZIGOU
- || orderMoneyRecievedMQMsg.getType() == OrderMoneyRecievedMQMsg.TYPE_SHARE) {
- if (!StringUtil.isNullOrEmpty(orderMoneyRecievedMQMsg.getOrderId())
- && orderMoneyRecievedMQMsg.getUid() != null) {
- // TODO 鑷喘涓庡垎浜鍗曞埌璐﹀鐞�
+ } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderStatisticDelay.name())) {// 璁㈠崟缁熻
+ OrderMQMsg orderMQMsg = new Gson().fromJson(new String(message.getBody()), OrderMQMsg.class);
+ int hour = 24;
+ if (Constant.IS_TEST) {
+ hour = 1;
}
- }
- return Action.CommitMessage;
+ if (orderMQMsg.getDelayHour() == hour) {
+ try {// 閭�璇峰鍔�
+ redPackWinInviteService.inviteSucceedReward(orderMQMsg.getUid());
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ return Action.ReconsumeLater;
+ }
+ }
+ return Action.CommitMessage;
+ } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderFanLiSeparateByOrderNo.name())) {// 璁㈠崟鍒拌处锛堟寜璁㈠崟鍙峰鐞嗭級
+ OrderMoneyRecievedMQMsg orderMoneyRecievedMQMsg = new Gson().fromJson(new String(message.getBody()),
+ OrderMoneyRecievedMQMsg.class);
+
+ if (orderMoneyRecievedMQMsg.getType() == OrderMoneyRecievedMQMsg.TYPE_INVITE) {
+ if (!StringUtil.isNullOrEmpty(orderMoneyRecievedMQMsg.getOrderId())
+ && orderMoneyRecievedMQMsg.getUid() != null) {
+ try {
+ redPackWinInviteService.inviteOrderArriveReward(orderMoneyRecievedMQMsg.getUid(),
+ orderMoneyRecievedMQMsg.getSourceType(), orderMoneyRecievedMQMsg.getOrderId());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ return Action.CommitMessage;
+ }
} else if (MQTopicName.TOPIC_USER.name().equalsIgnoreCase(message.getTopic())) {
boolean inviteSucceedReward = false;
Long uid = null;
@@ -125,7 +112,8 @@
UserAccountBindingMQMsg userAccountBindingMQMsg = new Gson().fromJson(new String(message.getBody()),
UserAccountBindingMQMsg.class);
Integer type = userAccountBindingMQMsg.getType();
- if (type == UserAccountBindingMQMsg.TYPE_PHONE || type == UserAccountBindingMQMsg.TYPE_TAOBAO) {
+ if (type == UserAccountBindingMQMsg.TYPE_PHONE || type == UserAccountBindingMQMsg.TYPE_WX
+ || type == UserAccountBindingMQMsg.TYPE_TAOBAO) {
inviteSucceedReward = true;
uid = userAccountBindingMQMsg.getUid();
}
@@ -134,16 +122,14 @@
UserInviteMQMsg.class);
inviteSucceedReward = true;
uid = userInviteMQMsg.getWorkerId();
- } else if (tag.equalsIgnoreCase(UserTopicTagEnum.integralTaskFinish.name())) {// 閲戝竵浠诲姟瀹屾垚
- IntegralTaskMQMsg integralTaskMQMsg = new Gson().fromJson(new String(message.getBody()),
- IntegralTaskMQMsg.class);
- inviteSucceedReward = true;
- uid = integralTaskMQMsg.getUid();
+
+ redPackWinInviteService.initCreateRedPackWin(userInviteMQMsg.getBossId(),
+ userInviteMQMsg.getWorkerId());
+
} else if (tag.equalsIgnoreCase(UserTopicTagEnum.redPackGiftDrawback.name())) {// 绾㈠寘璧犻��
UserRedPackGiftMQMsg userRedPackGiftMQMsg = new Gson().fromJson(new String(message.getBody()),
UserRedPackGiftMQMsg.class);
- // 绾㈠寘璧犻�佸埌鏈熸湭棰嗗彇
- try {
+ try { // 绾㈠寘璧犻�佸埌鏈熸湭棰嗗彇
redPackGiveRecordService.overdueByPrimaryKey(userRedPackGiftMQMsg.getId());
} catch (Exception e) {
e.printStackTrace();
@@ -153,15 +139,11 @@
if (inviteSucceedReward) {
try {// 閭�璇峰鍔�
- if (uid == 6269748) {
- System.out.println(uid);
- }
- // redPackWinInviteService.inviteSucceedReward(uid);
+ redPackWinInviteService.inviteSucceedReward(uid);
} catch (Exception e) {
e.printStackTrace();
}
}
-
}
return Action.CommitMessage;
}
--
Gitblit v1.8.0