Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17

YunaiV
2 parents 52e3bbdf d68047bb
Showing 3 changed files with 186 additions and 6 deletions
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/json/databind/TimestampLocalDateTimeDeserializer.java
yudao-framework/yudao-common/src/test/java/cn/iocoder/yudao/framework/common/util/json/databind/TimestampLocalDateTimeDeserializerTest.java
yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
 package cn.iocoder.yudao.framework.common.util.json.databind;
  
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
@@ -7,10 +10,10 @@ import com.fasterxml.jackson.databind.JsonDeserializer;
 import java.io.IOException;
 import java.time.Instant;
 import java.time.LocalDateTime;
-import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
  
 /**
- * 基于时间戳的 LocalDateTime 反序列化器
+ * LocalDateTime 反序列化器，支持毫秒时间戳、常见日期时间字符串和 ISO-8601 日期。
  *
  * @author 老五
  */
@@ -20,8 +23,20 @@ public class TimestampLocalDateTimeDeserializer extends JsonDeserializer&lt;LocalDa
  
     @Override
     public LocalDateTime deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
-        // 将 Long 时间戳，转换为 LocalDateTime 对象
-        return LocalDateTime.ofInstant(Instant.ofEpochMilli(p.getValueAsLong()), ZoneId.systemDefault());
+        String text = p.getText();
+        if (StrUtil.isBlank(text)) {
+            return null;
+        }
+        text = text.trim();
+        if (text.matches("-?\\d+")) {
+            return LocalDateTimeUtil.of(Long.parseLong(text));
+        }
+        // Hutool 5.x 的自动解析会忽略部分负时区偏移，并截断纳秒。
+        if (text.contains("T")) {
+            return LocalDateTimeUtil.of(DateTimeFormatter.ISO_DATE_TIME.parseBest(
+                    text, Instant::from, LocalDateTime::from));
+        }
+        return LocalDateTimeUtil.of(DateUtil.parse(text).toInstant());
     }
  
 }
+package cn.iocoder.yudao.framework.common.util.json.databind;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import org.junit.jupiter.api.Test;
+
+import java.time.LocalDateTime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+/**
+ * {@link TimestampLocalDateTimeDeserializer} 的单元测试
+ *
+ * 覆盖全部在用格式（epoch 毫秒 / 常见字符串 / ISO / 纯日期），
+ * 以及非法输入抛清晰错误（不再静默落 1970-01-01）。
+ *
+ * @author 芋道源码
+ */
+public class TimestampLocalDateTimeDeserializerTest {
+
+    private static final ObjectMapper MAPPER;
+
+    static {
+        ObjectMapper mapper = new ObjectMapper();
+        SimpleModule module = new SimpleModule();
+        module.addDeserializer(LocalDateTime.class, TimestampLocalDateTimeDeserializer.INSTANCE);
+        mapper.registerModule(module);
+        MAPPER = mapper;
+    }
+
+    private LocalDateTime parse(String json) throws Exception {
+        return MAPPER.readValue(json, LocalDateTime.class);
+    }
+
+    @Test
+    public void testEpochMilliNumber() throws Exception {
+        // 1700000000000 = 2023-11-14T22:13:20Z（本地时区换算后）
+        LocalDateTime expected = LocalDateTime.ofInstant(java.time.Instant.ofEpochMilli(1700000000000L), java.time.ZoneId.systemDefault());
+        assertEquals(expected, parse("1700000000000"));
+    }
+
+    @Test
+    public void testEpochMilliString() throws Exception {
+        LocalDateTime expected = LocalDateTime.ofInstant(java.time.Instant.ofEpochMilli(1700000000000L), java.time.ZoneId.systemDefault());
+        assertEquals(expected, parse("\"1700000000000\""));
+    }
+
+    @Test
+    public void testSpaceFormat() throws Exception {
+        assertEquals(LocalDateTime.of(2026, 9, 11, 8, 0, 0), parse("\"2026-09-11 08:00:00\""));
+    }
+
+    @Test
+    public void testSpaceFormatWithMillis() throws Exception {
+        assertEquals(LocalDateTime.of(2026, 9, 11, 8, 0, 0, 123000000), parse("\"2026-09-11 08:00:00.123\""));
+    }
+
+    @Test
+    public void testIsoLocal() throws Exception {
+        assertEquals(LocalDateTime.of(2026, 9, 11, 8, 0, 0), parse("\"2026-09-11T08:00:00\""));
+    }
+
+    @Test
+    public void testIsoLocalWithNanos() throws Exception {
+        assertEquals(LocalDateTime.of(2026, 9, 11, 8, 0, 0, 123456789),
+                parse("\"2026-09-11T08:00:00.123456789\""));
+    }
+
+    @Test
+    public void testIsoWithOffset() throws Exception {
+        // 前端 Date 对象序列化：带 Z（UTC）。2026-09-11T00:00:00Z 换算到系统时区
+        LocalDateTime expected = java.time.OffsetDateTime.parse("2026-09-11T00:00:00Z")
+                .atZoneSameInstant(java.time.ZoneId.systemDefault()).toLocalDateTime();
+        assertEquals(expected, parse("\"2026-09-11T00:00:00Z\""));
+    }
+
+    @Test
+    public void testIsoWithOffsetMillis() throws Exception {
+        // JSON.stringify(Date) 实际产物：带毫秒 + Z（无 value-format 的 Date 对象控件提交格式）
+        LocalDateTime expected = java.time.OffsetDateTime.parse("2026-09-11T00:00:00.000Z")
+                .atZoneSameInstant(java.time.ZoneId.systemDefault()).toLocalDateTime();
+        assertEquals(expected, parse("\"2026-09-11T00:00:00.000Z\""));
+    }
+
+    @Test
+    public void testIsoWithOffsetPlus() throws Exception {
+        // 带 +08:00 时区偏移的形式
+        LocalDateTime expected = java.time.OffsetDateTime.parse("2026-09-11T08:00:00.000+08:00")
+                .atZoneSameInstant(java.time.ZoneId.systemDefault()).toLocalDateTime();
+        assertEquals(expected, parse("\"2026-09-11T08:00:00.000+08:00\""));
+    }
+
+    @Test
+    public void testDateOnly() throws Exception {
+        assertEquals(LocalDateTime.of(2026, 9, 11, 0, 0, 0), parse("\"2026-09-11\""));
+    }
+
+    @Test
+    public void testIsoWithNegativeOffsetAndMillis() throws Exception {
+        LocalDateTime expected = java.time.OffsetDateTime.parse("2026-09-11T23:30:00.123-05:30")
+                .atZoneSameInstant(java.time.ZoneId.systemDefault()).toLocalDateTime();
+        assertEquals(expected, parse("\"2026-09-11T23:30:00.123-05:30\""));
+    }
+
+    @Test
+    public void testZeroAndNegativeEpochMilli() throws Exception {
+        for (long millis : new long[]{0L, -1L}) {
+            LocalDateTime expected = LocalDateTime.ofInstant(java.time.Instant.ofEpochMilli(millis),
+                    java.time.ZoneId.systemDefault());
+            assertEquals(expected, parse(Long.toString(millis)));
+            assertEquals(expected, parse("\"" + millis + "\""));
+        }
+    }
+
+    @Test
+    public void testSurroundingWhitespace() throws Exception {
+        assertEquals(LocalDateTime.of(2026, 9, 11, 8, 0, 0), parse("\" 2026-09-11 08:00:00 \""));
+    }
+
+    @Test
+    public void testNullAndEmpty() throws Exception {
+        assertNull(parse("null"));
+        assertNull(parse("\"\""));
+        assertNull(parse("\"   \""));
+    }
+
+    @Test
+    public void testHutoolDateFormats() throws Exception {
+        assertEquals(LocalDateTime.of(2026, 9, 11, 0, 0), parse("\"2026/09/11\""));
+        assertEquals(LocalDateTime.of(2026, 9, 11, 8, 0), parse("\"2026/09/11 08:00:00\""));
+    }
+
+    @Test
+    public void testInvalidThrows() {
+        // 非法输入抛清晰错误，不再静默落 1970
+        assertThrows(Exception.class, () -> parse("\"not-a-date\""));
+
+    }
+
+}
@@ -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