From a5d523eefb9c7f3e83692aadb5dbb17af68c57df Mon Sep 17 00:00:00 2001 From: zhangsan <646228430@qq.com> Date: Sun, 10 Aug 2025 14:13:03 +0800 Subject: [PATCH] =?UTF-8?q?8.10=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mysql/sql/group_buying_sys.sql | 18 +----------------- docs/tag/group-buy-v3.0/mysql/sql/paymall.sql | 5 ----- docs/tag/group-buy-v3.0/nginx/html/index.html | 4 ++-- .../edu/whut/config/DCCValueBeanFactory.java | 5 ++--- .../activity/service/trial/node/TagNode.java | 2 +- .../adapter/repository/TradeRepository.java | 1 - .../whut/infrastructure/dcc/DCCService.java | 1 + .../edu/whut/trigger/job/TimeoutRefundJob.java | 3 +-- 8 files changed, 8 insertions(+), 31 deletions(-) diff --git a/docs/tag/group-buy-v3.0/mysql/sql/group_buying_sys.sql b/docs/tag/group-buy-v3.0/mysql/sql/group_buying_sys.sql index 465d55a..67d4f4b 100644 --- a/docs/tag/group-buy-v3.0/mysql/sql/group_buying_sys.sql +++ b/docs/tag/group-buy-v3.0/mysql/sql/group_buying_sys.sql @@ -169,11 +169,6 @@ CREATE TABLE `group_buy_order` ( UNIQUE INDEX `uq_team_id`(`team_id` ASC) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 50 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '拼团订单表' ROW_FORMAT = DYNAMIC; --- ---------------------------- --- Records of group_buy_order --- ---------------------------- -INSERT INTO `group_buy_order` VALUES (49, '94097988', 100123, 's01', 'c01', 100.00, 20.00, 80.00, 3, 0, 0, 0, '2025-08-03 16:46:04', '2025-08-03 17:46:04', 'MQ', NULL, '2025-08-03 16:46:04', '2025-08-03 17:02:00'); -INSERT INTO `group_buy_order` VALUES (50, '07743427', 100123, 's01', 'c01', 100.00, 20.00, 80.00, 3, 1, 1, 0, '2025-08-07 16:03:13', '2025-08-07 17:03:13', 'MQ', NULL, '2025-08-07 16:03:13', '2025-08-07 16:04:20'); -- ---------------------------- -- Table structure for group_buy_order_list @@ -205,10 +200,6 @@ CREATE TABLE `group_buy_order_list` ( INDEX `idx_user_id_activity_id`(`user_id` ASC, `activity_id` ASC) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 63 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '拼团订单明细表' ROW_FORMAT = DYNAMIC; --- ---------------------------- --- Records of group_buy_order_list --- ---------------------------- -INSERT INTO `group_buy_order_list` VALUES (63, 'smile01', '07743427', '503870044908', 100123, '2025-08-07 16:03:13', '2025-08-07 16:18:13', '2025-08-07 17:03:13', '9890001', 's01', 'c01', 100.00, 20.00, 80.00, 1, '651958626376', '2025-08-07 16:03:13', '2025-08-07 16:04:20', '100123_smile01_1', '2025-08-07 16:03:28'); -- ---------------------------- -- Table structure for notify_task @@ -232,13 +223,6 @@ CREATE TABLE `notify_task` ( INDEX `uq_uuid`(`uuid` ASC) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 14 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; --- ---------------------------- --- Records of notify_task --- ---------------------------- -INSERT INTO `notify_task` VALUES (11, 100123, '94097988', 'trade_unpaid2refund', 'MQ', 'topic.team_refund', NULL, 1, 1, '{\"activityId\":100123,\"orderId\":\"563157026086\",\"teamId\":\"94097988\",\"outTradeNo\":\"729888750316\",\"type\":\"unpaid_unlock\",\"userId\":\"smile21\"}', '94097988_trade_unpaid2refund_563157026086', '2025-08-03 16:52:42', '2025-08-03 16:52:42'); -INSERT INTO `notify_task` VALUES (12, 100123, '94097988', 'trade_unpaid2refund', 'MQ', 'topic.team_refund', NULL, 1, 1, '{\"activityId\":100123,\"orderId\":\"524202010712\",\"teamId\":\"94097988\",\"outTradeNo\":\"030158231264\",\"type\":\"unpaid_unlock\",\"userId\":\"smile22\"}', '94097988_trade_unpaid2refund_524202010712', '2025-08-03 17:02:00', '2025-08-03 17:02:00'); -INSERT INTO `notify_task` VALUES (13, 100123, '94097988', 'trade_unpaid2refund', 'MQ', 'topic.team_refund', NULL, 1, 1, '{\"activityId\":100123,\"orderId\":\"492703934270\",\"teamId\":\"94097988\",\"outTradeNo\":\"340480871121\",\"type\":\"unpaid_unlock\",\"userId\":\"smile23\"}', '94097988_trade_unpaid2refund_492703934270', '2025-08-03 17:02:00', '2025-08-03 17:02:00'); - -- ---------------------------- -- Table structure for sc_sku_activity -- ---------------------------- @@ -280,6 +264,6 @@ CREATE TABLE `sku` ( -- ---------------------------- -- Records of sku -- ---------------------------- -INSERT INTO `sku` VALUES (1, 's01', 'c01', '9890001', '《手写MyBatis：渐进式源码实践》', 100.00, '2025-06-22 11:10:06', '2025-06-22 11:10:06'); +INSERT INTO `sku` VALUES (1, 's01', 'c01', '9890001', '《早晨从中午开始》', 100.00, '2025-06-22 11:10:06', '2025-06-22 11:10:06'); SET FOREIGN_KEY_CHECKS = 1; diff --git a/docs/tag/group-buy-v3.0/mysql/sql/paymall.sql b/docs/tag/group-buy-v3.0/mysql/sql/paymall.sql index 0177485..d2be54a 100644 --- a/docs/tag/group-buy-v3.0/mysql/sql/paymall.sql +++ b/docs/tag/group-buy-v3.0/mysql/sql/paymall.sql @@ -45,9 +45,4 @@ CREATE TABLE `pay_order` ( INDEX `idx_user_id_product_id`(`user_id` ASC, `product_id` ASC) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 46 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; --- ---------------------------- --- Records of pay_order --- ---------------------------- -INSERT INTO `pay_order` VALUES (49, 'smile01', '9890001', 'MyBatisBook', '651958626376', '2025-08-07 16:03:13', 100.00, 'PAY_SUCCESS', '
\n\n\n
\n', '2025-08-07 16:04:20', 1, 20.00, 80.00, '2025-08-07 16:03:13', '2025-08-07 16:04:20'); - SET FOREIGN_KEY_CHECKS = 1; diff --git a/docs/tag/group-buy-v3.0/nginx/html/index.html b/docs/tag/group-buy-v3.0/nginx/html/index.html index cfd3fbd..2c53fd0 100644 --- a/docs/tag/group-buy-v3.0/nginx/html/index.html +++ b/docs/tag/group-buy-v3.0/nginx/html/index.html @@ -3,7 +3,7 @@ - 手写 MyBatis：渐进式源码实践 - 拼多多 + 早晨从中午开始 路遥 - 拼多多 @@ -29,7 +29,7 @@
-
手写 MyBatis：渐进式源码实践（全彩）
+
早晨从中午开始 路遥（精装）
大促优惠 diff --git a/group-buying-sys-app/src/main/java/edu/whut/config/DCCValueBeanFactory.java b/group-buying-sys-app/src/main/java/edu/whut/config/DCCValueBeanFactory.java index 6662b78..83ece44 100644 --- a/group-buying-sys-app/src/main/java/edu/whut/config/DCCValueBeanFactory.java +++ b/group-buying-sys-app/src/main/java/edu/whut/config/DCCValueBeanFactory.java @@ -2,6 +2,7 @@ package edu.whut.config; import edu.whut.types.annotations.DCCValue; import edu.whut.types.common.Constants; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.redisson.api.RBucket; @@ -26,6 +27,7 @@ import java.util.Map; */ @Slf4j @Configuration +@RequiredArgsConstructor public class DCCValueBeanFactory implements BeanPostProcessor { /** Redis 中所有 DCC Key 的统一前缀 */ @@ -40,9 +42,6 @@ public class DCCValueBeanFactory implements BeanPostProcessor { * 通过构造器注入 RedissonClient，便于单元测试 Mock。 * @param redissonClient Spring 上下文提供的 RedissonClient */ - public DCCValueBeanFactory(RedissonClient redissonClient) { - this.redissonClient = redissonClient; - } /** * 定义一个 {@link RTopic} Bean 并注册监听器，用于接收 diff --git a/group-buying-sys-domain/src/main/java/edu/whut/domain/activity/service/trial/node/TagNode.java b/group-buying-sys-domain/src/main/java/edu/whut/domain/activity/service/trial/node/TagNode.java index 580cff9..5098bb5 100644 --- a/group-buying-sys-domain/src/main/java/edu/whut/domain/activity/service/trial/node/TagNode.java +++ b/group-buying-sys-domain/src/main/java/edu/whut/domain/activity/service/trial/node/TagNode.java @@ -38,7 +38,7 @@ public class TagNode extends AbstractGroupBuyMarketSupport退款 未支付->定时任务查询->调用拼团系统释放锁单。 public class TradeRepository implements ITradeRepository { private final IGroupBuyOrderDao groupBuyOrderDao; diff --git a/group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/dcc/DCCService.java b/group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/dcc/DCCService.java index 350a15e..c4202f4 100644 --- a/group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/dcc/DCCService.java +++ b/group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/dcc/DCCService.java @@ -51,6 +51,7 @@ public class DCCService { int lastTwoDigits = hashCode % 100; // 判断是否在切量范围内 + // 在范围内，可以继续参加活动 if (lastTwoDigits <= Integer.parseInt(cutRange)) { return true; } diff --git a/group-buying-sys-trigger/src/main/java/edu/whut/trigger/job/TimeoutRefundJob.java b/group-buying-sys-trigger/src/main/java/edu/whut/trigger/job/TimeoutRefundJob.java index e616f4a..7432953 100644 --- a/group-buying-sys-trigger/src/main/java/edu/whut/trigger/job/TimeoutRefundJob.java +++ b/group-buying-sys-trigger/src/main/java/edu/whut/trigger/job/TimeoutRefundJob.java @@ -15,7 +15,6 @@ import java.util.concurrent.TimeUnit; /** * 超时未支付订单退单定时任务 - */ @Slf4j @Service @@ -30,7 +29,7 @@ public class TimeoutRefundJob { /** * 每 5 分钟执行一次超时订单扫描 */ - @Scheduled(cron = "0 */1 * * * ?") + @Scheduled(cron = "0 */5 * * * ?") public void exec() { // 分布式锁，防止多实例重复执行 RLock lock = redissonClient.getLock("group_buy_market_timeout_refund_job_exec");