From 655998c805ee218da31191599d42e2d0b27c132f Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Sat, 29 Nov 2025 15:33:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E6=AD=A5=E9=9D=9E=E9=98=BB=E5=A1=9E?=
 =?UTF-8?q?=20=E7=A7=92=E6=95=B0=20=E5=A2=9E=E5=8A=A0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/common/constant/MqConstant.java       |  1 +
 .../service/impl/MqMessageServiceImpl.java     | 18 ------------------
 .../shop/order/listener/MessageListener.java   |  1 -
 .../order/listener/OrderPayedListener.java     |  3 +--
 .../service/impl/ShopOrderBaseServiceImpl.java | 10 +++++-----
 .../impl/ShopStorePrinterServiceImpl.java      |  8 +++++---
 .../ShopStorePrinterTemplateServiceImpl.java   |  3 +++
 .../templates/refund_order_printer.txt         |  2 +-
 8 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/mall-common/src/main/java/com/suisung/mall/common/constant/MqConstant.java b/mall-common/src/main/java/com/suisung/mall/common/constant/MqConstant.java
index f0ff94fb..08b49df9 100644
--- a/mall-common/src/main/java/com/suisung/mall/common/constant/MqConstant.java
+++ b/mall-common/src/main/java/com/suisung/mall/common/constant/MqConstant.java
@@ -14,6 +14,7 @@ public class MqConstant {
     public static final Integer FAILURE = 2; // 消息消费失败更改状态
     public static final Integer DELIVERED = 3; // 消息重试消费成功更改状态
     public static final Integer MAX_COUNT = 3; // 消息重新投递最大重试次数
+
     public static final String SHOP_EXCHANGE = "shop-event-exchange"; // SHOP服务交换机
     public static final String ACCOUNT_EXCHANGE = "account-event-exchange"; // ACCOUNT服务交换机
     public static final String PAY_EXCHANGE = "pay-event-exchange"; // PAY服务交换机
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/message/service/impl/MqMessageServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/message/service/impl/MqMessageServiceImpl.java
index 2bf95821..f82caac7 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/message/service/impl/MqMessageServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/message/service/impl/MqMessageServiceImpl.java
@@ -54,27 +54,9 @@ public class MqMessageServiceImpl extends BaseServiceImpl<MqMessageMapper, MqMes
             return;
         }
 
-        /*
-        String jsonString = null;
-
-        try {
-            ObjectMapper objectMapper = new ObjectMapper();
-            jsonString = objectMapper.writeValueAsString(data);
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
-
-        MessageProperties properties = new MessageProperties();
-        properties.setMessageId(uuid);
-        Message message = new Message(jsonString.getBytes(StandardCharsets.UTF_8), properties);
-
-        rabbitTemplate.convertAndSend(exchange, routing_key, message, new CorrelationData(uuid));
-         */
-
         // 使用 MessageBuilder 确保设置 messageId
         Message message = MessageBuilder.withBody(data.toString().getBytes(StandardCharsets.UTF_8))
                 .setHeader("messageId", uuid) // 添加自定义头部存储消息ID
-//                .setContentType("text/plain") // 明确指定内容类型
                 .setMessageId(uuid) // 设置标准 messageId 属性
                 .build();
 
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/listener/MessageListener.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/listener/MessageListener.java
index 5a73e477..0a434133 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/listener/MessageListener.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/listener/MessageListener.java
@@ -30,7 +30,6 @@ public class MessageListener {
         listener(dataStr, channel, message);
     }
 
-    //    @RabbitHandler
     public void listener(String data, Channel channel, Message message) {
         MsgTO msgTO = JSONUtil.toBean(data, MsgTO.class);
         String messageId = message.getMessageProperties().getMessageId();
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/listener/OrderPayedListener.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/listener/OrderPayedListener.java
index f876215d..3f181357 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/listener/OrderPayedListener.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/listener/OrderPayedListener.java
@@ -69,8 +69,7 @@ public class OrderPayedListener {
         String dataStr = new String(data, StandardCharsets.UTF_8);
         listener(dataStr, channel, message);
     }
-
-    //    @RabbitHandler
+    
     public void listener(String data, Channel channel, Message message) throws IOException, InterruptedException {
         // String messageId = message.getMessageProperties().getMessageId();
         if (StrUtil.isBlank(data)) {
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
index 8056b4ff..2cfd74d1 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
@@ -5182,11 +5182,11 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
     }
 
     /**
-     * 延迟 消息跳转路径设置接口
+     * 延迟 消息跳转路径设置接口（最好使用消息队列，延迟1秒消费）
      *
      * @param orderIds
      */
-    private void processOrderJumpPathAsync(List<String> orderIds) {
+    public void processOrderJumpPathAsync(List<String> orderIds) {
         if (CollectionUtils.isEmpty(orderIds)) {
             return;
         }
@@ -5195,15 +5195,15 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
             for (String orderId : orderIds) {
                 try {
                     // 控制API调用频率
-                    Thread.sleep(300); // 根据实际API限制调整
+                    Thread.sleep(1200); // 根据实际API限制调整
                     wxOrderShippingService.setMsgJumpPath(orderId);
+                    log.info("[异步处理] 订单跳转路径设置入口 processOrderJumpPathAsync，订单ID: {}", orderId);
                 } catch (InterruptedException e) {
                     Thread.currentThread().interrupt();
-                    log.warn("[异步处理] 线程中断，订单ID: {}", orderId);
+                    log.error("[异步处理] 线程中断，订单ID: {}", orderId);
                     break;
                 } catch (Exception e) {
                     log.warn("[异步处理] 消息跳转路径设置失败，订单ID: {}, 错误: {}", orderId, e.getMessage());
-                    // 继续处理下一个订单
                 }
             }
         }, executor);
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterServiceImpl.java
index a1debf34..31f14fb4 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterServiceImpl.java
@@ -444,7 +444,7 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl<ShopStorePrinte
             orderId = binding.getOrder_id();
             Integer storeId = binding.getStore_id();
             if (CheckUtil.isEmpty(storeId) || CheckUtil.isEmpty(orderId)) {
-                logger.warn("订单Id:{}，店铺ID:{}为空，无法打印小票。", orderId, storeId);
+                logger.error("订单Id:{}，店铺ID:{}为空，无法打印小票。", orderId, storeId);
                 return false;
             }
 
@@ -458,7 +458,9 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl<ShopStorePrinte
 
             // 获取适用于退货场景的打印模板
             ShopStorePrinterTemplate template = shopStorePrinterTemplateService.getShopStorePrinterTemplateInner(storeId, StateCode.PRINTER_TEMP_CATE_REFUND);
-            if (template == null || StrUtil.isBlank(template.getTemplate_name()) || StrUtil.isBlank(template.getTemplate_value())) {
+            if (template == null
+                    || StrUtil.isBlank(template.getTemplate_name())
+                    || StrUtil.isBlank(template.getTemplate_value())) {
                 // 模板缺失或无效，终止打印流程
                 logger.error("店铺{}未添加打票机打印模版，无法打印小票。", storeId);
                 return false;
@@ -527,7 +529,7 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl<ShopStorePrinte
                 }
             }
 
-            logger.debug("#### 调用飞鹅打票机的打印操作结束 ####");
+            logger.debug("#### 调用飞鹅打票机的打印退款订单操作结束 ####");
             return true;
 
         } catch (Exception e) {
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterTemplateServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterTemplateServiceImpl.java
index ed02d601..04999e93 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterTemplateServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterTemplateServiceImpl.java
@@ -2,6 +2,7 @@ package com.suisung.mall.shop.store.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.suisung.mall.common.api.CommonResult;
+import com.suisung.mall.common.constant.CommonConstant;
 import com.suisung.mall.common.modules.store.ShopStorePrinterTemplate;
 import com.suisung.mall.core.web.service.impl.BaseServiceImpl;
 import com.suisung.mall.shop.store.mapper.ShopStorePrinterTemplateMapper;
@@ -37,6 +38,7 @@ public class ShopStorePrinterTemplateServiceImpl extends BaseServiceImpl<ShopSto
             QueryWrapper<ShopStorePrinterTemplate> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("store_id", storeId != null ? storeId : 0)
                     .eq("category", category)
+                    .eq("status", CommonConstant.Enable)
                     .orderByAsc("template_id");
 
             ShopStorePrinterTemplate shopStorePrinterTemplate = findOne(queryWrapper);
@@ -46,6 +48,7 @@ public class ShopStorePrinterTemplateServiceImpl extends BaseServiceImpl<ShopSto
                 queryWrapper.clear();
                 queryWrapper.eq("store_id", 0)
                         .eq("category", category)
+                        .eq("status", CommonConstant.Enable)
                         .orderByAsc("template_id");
 
                 shopStorePrinterTemplate = findOne(queryWrapper);
diff --git a/mall-shop/src/main/resources/templates/refund_order_printer.txt b/mall-shop/src/main/resources/templates/refund_order_printer.txt
index f4aa09e7..d2ca2d0a 100644
--- a/mall-shop/src/main/resources/templates/refund_order_printer.txt
+++ b/mall-shop/src/main/resources/templates/refund_order_printer.txt
@@ -47,7 +47,7 @@
 --------------------------------<BR>
 <CB>#${order_pickup_num_str}</CB><BR>
 <L>退款原因：${return_buyer_message!'-'}</L><BR>
-<BOLD>配送时间：${payment_time?string('yyyy-MM-dd HH:mm:ss')}（之后20-30分钟）</BOLD><BR>
+<BOLD>配送时间：${payment_time?string('yyyy-MM-dd HH:mm:ss')}（20-30分钟）</BOLD><BR>
 --------------------------------<BR>
 订单编号：${order_id}<BR>
 退单编号：${return_id}<BR>