From e912e57041a3ce2de668d73b4dc4a9f3899ba416 Mon Sep 17 00:00:00 2001
From: dadiyang <dadiyang@aliyun.com>
Date: Sun, 27 Sep 2026 23:35:39 +0800
Subject: [PATCH] fix(promotion)：注册新人券发放过滤已过期模板并逐模板容错，避免单张过期券中断整批发放导致新用户一张券都领不到（A58）

---
 yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java b/yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
index dd433f3..6276194 100644
--- a/yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
+++ b/yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
@@ -215,9 +215,32 @@ public class CouponServiceImpl implements CouponService {
     @Transactional(rollbackFor = Exception.class)
     public void takeCouponByRegister(Long userId) {
         List<CouponTemplateDO> templates = couponTemplateService.getCouponTemplateListByTakeType(CouponTakeTypeEnum.REGISTER);
-        for (CouponTemplateDO template : templates) {
-            takeCoupon(template, CollUtil.newHashSet(userId), CouponTakeTypeEnum.REGISTER);
+        // 1. 过滤不可领取（如已过期）的模板，避免单张异常中断整批
+        List<CouponTemplateDO> takeableTemplates = templates.stream()
+                .filter(this::isCouponTemplateNotExpired)
+                .collect(Collectors.toList());
+        if (takeableTemplates.size() < templates.size()) {
+            log.info("[takeCouponByRegister][用户({}) 过滤 {} 张不可领取的模板]", userId, templates.size() - takeableTemplates.size());
         }
+        // 2. 逐个发放，单张失败不影响其余
+        int successCount = 0;
+        for (CouponTemplateDO template : takeableTemplates) {
+            try {
+                takeCoupon(template, CollUtil.newHashSet(userId), CouponTakeTypeEnum.REGISTER);
+                successCount++;
+            } catch (Exception e) {
+                log.error("[takeCouponByRegister][用户({}) 模板({}) 发放失败]", userId, template.getId(), e);
+            }
+        }
+        // 3. 应发全失败时留一条 ERROR 标记，供监控告警
+        if (CollUtil.isNotEmpty(takeableTemplates) && successCount == 0) {
+            log.error("[takeCouponByRegister][用户({}) 全部 {} 张新人券发放失败]", userId, takeableTemplates.size());
+        }
+    }
+
+    private boolean isCouponTemplateNotExpired(CouponTemplateDO template) {
+        return !CouponTemplateValidityTypeEnum.DATE.getType().equals(template.getValidityType())
+                || !LocalDateTimeUtils.beforeNow(template.getValidEndTime());
     }
 
     @Override
--
libgit2 0.21.4