From 7ac540dfa972b7e45332dfef7e0a00824b55ef66 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 9 Jan 2026 15:59:37 +0800
Subject: [PATCH] MQ

---
 .../java/com/czg/mq/EntryManagerMqListener.java  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/cash-api/order-server/src/main/java/com/czg/mq/EntryManagerMqListener.java b/cash-api/order-server/src/main/java/com/czg/mq/EntryManagerMqListener.java
index 2c161cfc8..c7b85df9b 100644
--- a/cash-api/order-server/src/main/java/com/czg/mq/EntryManagerMqListener.java
+++ b/cash-api/order-server/src/main/java/com/czg/mq/EntryManagerMqListener.java
@@ -48,20 +48,24 @@ public class EntryManagerMqListener {
     )
     @RabbitHandler
     public void handle(Message message, Channel channel, String msg) throws IOException {
+        log.info("进件1MQ对接开始shopId:{}", msg);
         String messageId = message.getMessageProperties().getMessageId();
-        if (hasMessageId(messageId)) {
-            return;
-        }
+        log.info("进件0MQ对接开始shopId:{}messageId:{}", msg, messageId);
+//        if (hasMessageId(messageId)) {
+//            return;
+//        }
         try {
             Long shopId = Long.valueOf(msg);
             // 将唯一标识添加到日志上下文
-            ThreadContext.put("traceId", messageId);
+//            ThreadContext.put("traceId", messageId);
+            log.info("进件2MQ对接开始shopId:{}", msg);
             // 安全转换shopId
             if (shopId == null) {
                 channel.basicNack(message.getMessageProperties().getDeliveryTag(), false, false);
                 return;
             }
             AggregateMerchantVO entry = shopDirectMerchantService.getEntry(Long.valueOf(msg));
+            log.info("进件3MQ对接开始shopId:{}", msg);
             if (entry != null) {
                 EntryManager.uploadParamImage(entry);
                 List<String> platform = new ArrayList<>();
@@ -97,9 +101,9 @@ public class EntryManagerMqListener {
 
             channel.basicNack(message.getMessageProperties().getDeliveryTag(), false, false);
         } finally {
-            delMessageId(messageId);
+//            delMessageId(messageId);
             // 清除日志上下文信息
-            ThreadContext.remove("messageId");
+//            ThreadContext.remove("messageId");
         }
     }