From 148af6b2f57be264c84d0991237fbd7ddea491a4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 04 十一月 2019 09:55:55 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/coupon/SystemCouponMessageListener.java | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/coupon/SystemCouponMessageListener.java b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/coupon/SystemCouponMessageListener.java
index 9ceb60a..584d637 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/coupon/SystemCouponMessageListener.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/coupon/SystemCouponMessageListener.java
@@ -9,35 +9,46 @@
import com.aliyun.openservices.ons.api.Message;
import com.aliyun.openservices.ons.api.MessageListener;
import com.google.gson.Gson;
-import com.yeshi.fanli.dto.order.OrderMoneyRecievedMQMsgDTO;
+import com.yeshi.fanli.dto.mq.BaseMQMsgBody;
+import com.yeshi.fanli.dto.mq.order.OrderTopicTagEnum;
+import com.yeshi.fanli.dto.mq.order.body.OrderMoneyRecievedMQMsg;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
@Component
public class SystemCouponMessageListener implements MessageListener {
-
+
@Resource
private UserSystemCouponService userSystemCouponService;
-
+
@Override
public Action consume(Message message, ConsumeContext context) {
LogHelper.mqInfo("consumer-SystemCouponMessageListener", message.getTopic(), message.getTag(),
new String(message.getBody()));
- if (MQTopicName.TOPIC_FANLI.name().equalsIgnoreCase(message.getTopic())) {
- OrderMoneyRecievedMQMsgDTO orderMoneyRecievedMQMsgDTO = new Gson().fromJson(new String(message.getBody()),
- OrderMoneyRecievedMQMsgDTO.class);
- if (orderMoneyRecievedMQMsgDTO != null) {
- if (orderMoneyRecievedMQMsgDTO.getOrderFirst() != null
- && orderMoneyRecievedMQMsgDTO.getOrderFirst() == true) {
- // 棣栨鍒拌处杩斿埄
- // TODO 涓氬姟浠ｇ爜娣诲姞
-
- // 婵�娲诲厤鍗曞埜
- userSystemCouponService.triggerFreeCouponActivate(orderMoneyRecievedMQMsgDTO.getUid());
-
- // 涓氬姟浠ｇ爜鎵ц鎴愬姛鍚庤繑鍥�
- return Action.CommitMessage;
+ String tag = message.getTag();
+ BaseMQMsgBody baseBody = new Gson().fromJson(new String(message.getBody()), BaseMQMsgBody.class);
+ if (baseBody.isTest() != Constant.IS_TEST)
+ return Action.ReconsumeLater;
+
+ if (MQTopicName.TOPIC_ORDER.name().equalsIgnoreCase(message.getTopic())) {
+ if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderFanLiActual.name()))// 瀹炴椂鍒拌处
+ {
+ OrderMoneyRecievedMQMsg orderMoneyRecievedMQMsgDTO = new Gson().fromJson(new String(message.getBody()),
+ OrderMoneyRecievedMQMsg.class);
+ if (orderMoneyRecievedMQMsgDTO != null) {
+ if (orderMoneyRecievedMQMsgDTO.getOrderFirst() != null
+ && orderMoneyRecievedMQMsgDTO.getOrderFirst() == true) {
+ // 棣栨鍒拌处杩斿埄
+ // TODO 涓氬姟浠ｇ爜娣诲姞
+
+ // 婵�娲诲厤鍗曞埜
+ userSystemCouponService.triggerFreeCouponActivate(orderMoneyRecievedMQMsgDTO.getUid());
+
+ // 涓氬姟浠ｇ爜鎵ц鎴愬姛鍚庤繑鍥�
+ return Action.CommitMessage;
+ }
}
}
}
--
Gitblit v1.8.0