From b59fef5c00b15fdfdfa9d4be26e5bf6b41c75458 Mon Sep 17 00:00:00 2001 From: admin <2780501319@qq.com> Date: 星期日, 23 二月 2020 00:16:52 +0800 Subject: [PATCH] 2.0.7相关服务端功能添加 --- fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/InviteOrderSubsidyMessageListener.java | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/InviteOrderSubsidyMessageListener.java b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/InviteOrderSubsidyMessageListener.java index 9efb569..67d2174 100644 --- a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/InviteOrderSubsidyMessageListener.java +++ b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/InviteOrderSubsidyMessageListener.java @@ -13,7 +13,6 @@ import com.aliyun.openservices.ons.api.Producer; import com.aliyun.openservices.ons.api.SendResult; import com.google.gson.Gson; -import com.yeshi.fanli.dto.mq.BaseMQMsgBody; import com.yeshi.fanli.dto.mq.order.OrderTopicTagEnum; import com.yeshi.fanli.dto.mq.order.body.OrderMQMsg; import com.yeshi.fanli.dto.mq.order.body.OrderMoneyRecievedMQMsg; @@ -31,6 +30,7 @@ import com.yeshi.fanli.service.inter.order.OrderMoneySettleService; import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService; import com.yeshi.fanli.util.Constant; +import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory; import com.yeshi.fanli.util.rocketmq.MQTopicName; /** @@ -62,12 +62,8 @@ @Override public Action consume(Message message, ConsumeContext context) { - - BaseMQMsgBody baseBody = new Gson().fromJson(new String(message.getBody()), BaseMQMsgBody.class); - if (baseBody.isTest() != Constant.IS_TEST) - return Action.ReconsumeLater; - LogHelper.mqInfo("consumer:InviteOrderSubsidyMessageListener", message.getMsgID(),message.getTopic(), message.getTag(), - new String(message.getBody())); + LogHelper.mqInfo("consumer:InviteOrderSubsidyMessageListener", message.getMsgID(), message.getTopic(), + message.getTag(), new String(message.getBody())); String tag = message.getTag(); if (MQTopicName.TOPIC_ORDER.name().equalsIgnoreCase(message.getTopic())) { @@ -129,7 +125,9 @@ } } } - } else if (tag.equalsIgnoreCase(UserTopicTagEnum.useSystemCoupon.name())) { + } + } else if (MQTopicName.TOPIC_USER.name().equalsIgnoreCase(message.getTopic())) { + if (tag.equalsIgnoreCase(UserTopicTagEnum.useSystemCoupon.name())) { UserSystemCouponUseMQMsg dto = new Gson().fromJson(new String(message.getBody()), UserSystemCouponUseMQMsg.class); if (dto != null && dto.getCouponType() @@ -143,6 +141,7 @@ return Action.CommitMessage; } } + // } return Action.CommitMessage; } @@ -154,8 +153,7 @@ */ private boolean sendOrderSubsidyUpdateLater(OrderMoneyRecievedMQMsg dto, int day) { - Message msg = new Message(MQTopicName.TOPIC_ORDER.name(), OrderTopicTagEnum.orderFanLiDelay.name(), - new Gson().toJson(dto).getBytes()); + Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.orderFanLiDelay, dto); msg.setKey(dto.getSourceType() + "_" + dto.getOrderId()); long delayTime = System.currentTimeMillis() + (Constant.IS_TEST ? 1000 * 30L : 1000 * 60 * 60 * 24L * day); msg.setStartDeliverTime(delayTime); -- Gitblit v1.8.0