进件标识

cash-api/order-server/src/main/java/com/czg/mq/EntryManagerMqListener.java

@@ -65,7 +65,7 @@ public class EntryManagerMqListener {
             channel.basicNack(deliveryTag, false, false);
             return;
         }
-        if (hasMessageId(String.valueOf(shopId))) {
+        if (hasMessageId(msg)) {
             return;
         }
         try {
@@ -102,14 +102,14 @@ public class EntryManagerMqListener {
         } catch (Exception e) {
             log.error("进件MQ对接业务异常shopId:{}", msg, e);
             ShopDirectMerchant merchant = new ShopDirectMerchant();
-            merchant.setShopId(Long.valueOf(msg));
+            merchant.setShopId(shopId);
             merchant.setWechatStatus(PayCst.EntryStatus.REJECTED);
             merchant.setAlipayStatus(PayCst.EntryStatus.REJECTED);
             merchant.setErrorMsg("系统错误，请联系管理员后重试。");
             shopDirectMerchantService.updateById(merchant);
             channel.basicNack(deliveryTag, false, false);
         } finally {
-            delMessageId(String.valueOf(shopId));
+            delMessageId(msg);
 //             清除日志上下文信息
             ThreadContext.remove("messageId");
         }