From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/OrderMoneyRecievedMessageListener.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/OrderMoneyRecievedMessageListener.java b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/OrderMoneyRecievedMessageListener.java
index ac8446a..b0a85ff 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/OrderMoneyRecievedMessageListener.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/OrderMoneyRecievedMessageListener.java
@@ -16,11 +16,13 @@
import com.aliyun.openservices.ons.api.Message;
import com.aliyun.openservices.ons.api.MessageListener;
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.OrderMoneyRecievedMQMsg;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.order.HongBaoOrder;
import com.yeshi.fanli.entity.order.HongBaoV2SettleTemp;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.hongbao.HongBaoV2SettleTempService;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
@@ -65,6 +67,8 @@
@Override
public Action consume(Message message, ConsumeContext context) {
+ LogHelper.mqInfo("consumer:OrderMoneyRecievedMessageListener", message.getMsgID(), message.getTopic(),
+ message.getTag(), new String(message.getBody()));
// 鏍规嵁绾㈠寘鍋氳鍗曞垎鍙�
if (MQTopicName.TOPIC_ORDER.name().equalsIgnoreCase(message.getTopic())) {
if (OrderTopicTagEnum.orderFanLiActual.name().equalsIgnoreCase(message.getTag())) {
@@ -81,6 +85,7 @@
mainHongBaoId = v2.getParent().getId();
HongBaoOrder hongBaoOrder = hongBaoOrderService.selectDetailByHongBaoId(mainHongBaoId);
if (hongBaoOrder != null && hongBaoOrder.getCommonOrder() != null) {
+ // 鎸夎鍗曞彿涓庣敤鎴风粺璁¤祫閲�
String mapKey = String.format("%s#%s#%s#%s", hongBaoOrder.getCommonOrder().getOrderNo(),
hongBaoOrder.getCommonOrder().getSourceType(), v2.getUserInfo().getId(),
getHongBaoType(v2.getType()));
@@ -101,6 +106,7 @@
OrderMoneyRecievedMQMsg msg = new OrderMoneyRecievedMQMsg(Integer.parseInt(type),
Long.parseLong(uid), Integer.parseInt(sourceType), orderNo, moneyMap.get(mapKey),
new Date(), 0);
+ LogHelper.test(String.format("鎵归噺杩斿埄鍒拌处璁㈠崟鍒嗗彂:\n key鍊�:%s \n 鍐呭:%s", key, new Gson().toJson(msg)));
producer.send(MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER,
OrderTopicTagEnum.orderFanLiSeparateByOrderNo, msg));
}
--
Gitblit v1.8.0