From 8642f365eab0a47eeaa83d2d56cdee0bb9542546 Mon Sep 17 00:00:00 2001
From: wuxicheng <1441859745@qq.com>
Date: Sun, 21 May 2023 01:07:11 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bnyer/common/rocketmq/domain/BaseMessage.java | 2 +-
 .../bnyer/common/rocketmq/template/RocketMQEnhanceTemplate.java | 2 +-
 .../order/service/impl/OrderMqMessageRecordServiceImpl.java     | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bnyer-common/bnyer-common-rocketmq/src/main/java/com/bnyer/common/rocketmq/domain/BaseMessage.java b/bnyer-common/bnyer-common-rocketmq/src/main/java/com/bnyer/common/rocketmq/domain/BaseMessage.java
index d70ab58..91a1efa 100644
--- a/bnyer-common/bnyer-common-rocketmq/src/main/java/com/bnyer/common/rocketmq/domain/BaseMessage.java
+++ b/bnyer-common/bnyer-common-rocketmq/src/main/java/com/bnyer/common/rocketmq/domain/BaseMessage.java
@@ -42,6 +42,6 @@ public class BaseMessage {
     /**
      * 重试次数，用于判断重试次数，超过重试次数发送异常警告
      */
-    protected Integer retryTimes;
+    protected Integer retryTimes = 0;
 
 }
diff --git a/bnyer-common/bnyer-common-rocketmq/src/main/java/com/bnyer/common/rocketmq/template/RocketMQEnhanceTemplate.java b/bnyer-common/bnyer-common-rocketmq/src/main/java/com/bnyer/common/rocketmq/template/RocketMQEnhanceTemplate.java
index 13b77f1..0c00482 100644
--- a/bnyer-common/bnyer-common-rocketmq/src/main/java/com/bnyer/common/rocketmq/template/RocketMQEnhanceTemplate.java
+++ b/bnyer-common/bnyer-common-rocketmq/src/main/java/com/bnyer/common/rocketmq/template/RocketMQEnhanceTemplate.java
@@ -47,7 +47,7 @@ public class RocketMQEnhanceTemplate {
      * 根据环境重新隔离topic
      * @param topic 原始topic
      */
-    private String reBuildTopic(String topic) {
+    public String reBuildTopic(String topic) {
         if(rocketEnhanceProperties.isEnabledIsolation() && StringUtils.isNoneBlank(rocketEnhanceProperties.getEnvironment())){
             return topic +"-" + rocketEnhanceProperties.getEnvironment();
         }
diff --git a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/impl/OrderMqMessageRecordServiceImpl.java b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/impl/OrderMqMessageRecordServiceImpl.java
index 055e3f4..bdccaf5 100644
--- a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/impl/OrderMqMessageRecordServiceImpl.java
+++ b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/impl/OrderMqMessageRecordServiceImpl.java
@@ -106,6 +106,7 @@ public class OrderMqMessageRecordServiceImpl implements OrderMqMessageRecordServ
      */
     @Transactional
     public <T> OrderMqMessageRecord saveMessageRecord(String topic, String tag, T message){
+        topic = rocketMQEnhanceTemplate.reBuildTopic(topic);
         OrderMqMessageRecord orderMqMessageRecord = new OrderMqMessageRecord();
         orderMqMessageRecord.setStatus(EnumMessageStatus.PROCESS);
         orderMqMessageRecord.setConsumerGroupName(topic);