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 orderIds) { + public void processOrderJumpPathAsync(List orderIds) { if (CollectionUtils.isEmpty(orderIds)) { return; } @@ -5195,15 +5195,15 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl 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 #${order_pickup_num_str}
退款原因:${return_buyer_message!'-'}
-配送时间:${payment_time?string('yyyy-MM-dd HH:mm:ss')}(之后20-30分钟)
+配送时间:${payment_time?string('yyyy-MM-dd HH:mm:ss')}(20-30分钟)
--------------------------------
订单编号:${order_id}
退单编号:${return_id}