From 4964d973d0aa4310be680d6c9583e5570017b5e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E6=AC=A7=EF=BC=88=E6=9E=97=E5=B9=B3=E5=87=A1?= =?UTF-8?q?=EF=BC=89?= Date: Wed, 12 Mar 2025 17:19:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/van/business/mq/MessageConsumerService.java | 2 +- src/main/java/cn/van/business/util/OrderUtil.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/cn/van/business/mq/MessageConsumerService.java b/src/main/java/cn/van/business/mq/MessageConsumerService.java index 0b1b32e..0b923dc 100644 --- a/src/main/java/cn/van/business/mq/MessageConsumerService.java +++ b/src/main/java/cn/van/business/mq/MessageConsumerService.java @@ -30,7 +30,7 @@ import static cn.van.business.util.WXUtil.WX_BASE_URL; public class MessageConsumerService implements RocketMQListener { private static final Logger logger = LoggerFactory.getLogger(MessageConsumerService.class); - private static final RateLimiter rateLimiter = RateLimiter.create(2, // 1 QPS + private static final RateLimiter rateLimiter = RateLimiter.create(4, // 1 QPS 0, // 预热期 5 秒 TimeUnit.SECONDS); diff --git a/src/main/java/cn/van/business/util/OrderUtil.java b/src/main/java/cn/van/business/util/OrderUtil.java index ebbf95e..adc2d9f 100644 --- a/src/main/java/cn/van/business/util/OrderUtil.java +++ b/src/main/java/cn/van/business/util/OrderUtil.java @@ -73,8 +73,11 @@ public class OrderUtil { String wxId = getWxidFromJdid(orderRowList.get(0).getUnionId().toString()); StringBuilder content = new StringBuilder(); content.append("批量订单：\n\r ").append(" 共 ").append(orderRowList.size()).append("单 \n\r"); - List filterList = orderRowList.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).toList(); - content.append("移除取消的订单, 共 ").append(filterList.size()).append("单 \n\r"); + List filterList = orderRowList.stream().filter(orderRow -> orderRow.getValidCode() == 16 + || orderRow.getValidCode() == 17 + || orderRow.getValidCode() == 15 + || orderRow.getValidCode() == 13).toList(); + content.append("移除取消的订单（保留状态 13 15 16 17）, 共 ").append(filterList.size()).append("单 \n\r"); for (OrderRow orderRow : filterList) { String oldValidCode = redisTemplate.opsForValue().get(ORDER_ROW_KEY + orderRow.getId());