From c3a5e164cbabbfc5f66e1356cb0de657ce3f58b9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 三月 2020 13:56:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/InviteOrderSubsidyMessageListener.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 fc7a2fb..980dc0e 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
@@ -62,8 +62,8 @@
@Override
public Action consume(Message message, ConsumeContext context) {
- 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())) {
@@ -119,13 +119,20 @@
dto.getSourceType());
} else {
// 浣挎暟鎹湁鏁�
- inviteOrderSubsidyService.validByOrderIdAndSourceType(dto.getOrderId(),
- dto.getSourceType());
+ try {
+ inviteOrderSubsidyService.validByOrderIdAndSourceType(dto.getOrderId(),
+ dto.getSourceType());
+ } catch (InviteOrderSubsidyException e) {
+ e.printStackTrace();
+ return Action.ReconsumeLater;
+ }
}
}
}
}
- } 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()
@@ -139,6 +146,7 @@
return Action.CommitMessage;
}
}
+ //
}
return Action.CommitMessage;
}
@@ -150,8 +158,7 @@
*/
private boolean sendOrderSubsidyUpdateLater(OrderMoneyRecievedMQMsg dto, int day) {
- Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.orderFanLiDelay,
- dto);
+ 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