From e40d1c22c7202aac843c66f9ee9cc000744f9e10 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 六月 2020 15:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/redpack/RedPackMessageListener.java | 42 ++++++++----------------------------------
1 files changed, 8 insertions(+), 34 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 5416749..be3120a 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
@@ -11,12 +11,11 @@
import com.aliyun.openservices.ons.api.Producer;
import com.google.gson.Gson;
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.OrderConfirmMQMsg;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.redpack.RedPackGiveRecordService;
import com.yeshi.fanli.service.inter.redpack.RedPackWinInviteService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
-import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
/**
@@ -49,39 +48,14 @@
tag = "";
if (MQTopicName.TOPIC_ORDER.name().equalsIgnoreCase(message.getTopic())) {
- if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderStatistic.name())) {// 璁㈠崟缁�
- OrderMQMsg orderMQMsg = new Gson().fromJson(new String(message.getBody()), OrderMQMsg.class);
- // 鍙戦��24灏忔椂寤舵椂娑堟伅
- // 娴嬭瘯鏃跺彂閫�
- int hour = 48;
- if (Constant.IS_TEST) {
- hour = 1;
+ // 璁㈠崟纭鏀惰揣
+ if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderConfirm.name())) {
+ OrderConfirmMQMsg mqMsg = new Gson().fromJson(new String(message.getBody()), OrderConfirmMQMsg.class);
+ try {// 閭�璇峰鍔�
+ redPackWinInviteService.winRedPackByOrder(mqMsg.getSourceUid(), mqMsg.getOrderNo(), mqMsg.getSourceType());
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
}
- orderMQMsg.setDelayHour(hour);
- Message msg = new Message(message.getTopic(), OrderTopicTagEnum.orderStatisticDelay.name(),
- new Gson().toJson(orderMQMsg).getBytes());
- if (orderMQMsg.getStaticticDate().getTime() + 1000 * 60 * 60L * hour > System.currentTimeMillis())// 鏃堕棿鏄惁宸茬粡杩囦簡
- msg.setStartDeliverTime(orderMQMsg.getStaticticDate().getTime() + 1000 * 60 * 60L * hour);
- else
- msg.setStartDeliverTime(System.currentTimeMillis() + 1000 * 60);
- producer.send(msg);
- return Action.CommitMessage;
- } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderStatisticDelay.name())) {// 璁㈠崟缁熻
- OrderMQMsg mqMsg = new Gson().fromJson(new String(message.getBody()), OrderMQMsg.class);
- int hour = 48;
- if (Constant.IS_TEST) {
- hour = 1;
- }
-
- if (mqMsg.getDelayHour() == hour) {
- try {// 閭�璇峰鍔�
- redPackWinInviteService.winRedPackByOrder(mqMsg.getUid(), mqMsg.getOrderId(), mqMsg.getType());
- } catch (Exception e) {
- LogHelper.errorDetailInfo(e);
- return Action.ReconsumeLater;
- }
- }
- return Action.CommitMessage;
}
}
return Action.CommitMessage;
--
Gitblit v1.8.0