From 0d91bad397c1a1b41bc77d9cd9f7555ed78f7f1a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 19 三月 2020 16:57:48 +0800
Subject: [PATCH] 团队奖励相关机制建立

---
 fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/InviteOrderSubsidyMessageListener.java |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 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 f3d0572..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
@@ -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;
@@ -63,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())) {
@@ -120,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()
@@ -140,6 +146,7 @@
 					return Action.CommitMessage;
 				}
 			}
+			//
 		}
 		return Action.CommitMessage;
 	}
@@ -151,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