factor:时间格式优化，移除时区限制为东八区，由LocalDateTime改为OffsetDateTime

2026-03-14 22:03:41 +08:00 · 2023-02-23 08:53:45 +08:00
parent 2fa018a0c9
commit dccc105807
24 changed files with 95 additions and 60 deletions
--- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/AbstractPayParams.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/AbstractPayParams.java
@@ -20,7 +20,7 @@ package cn.felord.payment.wechat.v3.model;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

-import java.time.LocalDateTime;
+import java.time.OffsetDateTime;

 /**
 * The type Abstract pay params.
@@ -44,8 +44,8 @@ public abstract class AbstractPayParams {
    /**
     * 订单失效时间 rfc 3339 YYYY-MM-DDTHH:mm:ss+TIMEZONE
     */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
-    private LocalDateTime timeExpire;
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    private OffsetDateTime timeExpire;
    /**
     * 附加数据，在查询API和支付通知中原样返回，可作为自定义参数使用
     */
--- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponsCardSendParams.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponsCardSendParams.java
@@ -53,6 +53,6 @@ public class CouponsCardSendParams {
    /**
     * 请求发卡时间,由于系统限制，暂不支持传入早于当前时间24小时以上的时间进行发券请求。
     */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
    private OffsetDateTime sendTime;
 }
--- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/ProfitSharingConsumeData.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/ProfitSharingConsumeData.java
@@ -20,7 +20,7 @@ import cn.felord.payment.wechat.v3.model.profitsharing.Receiver;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

-import java.time.LocalDateTime;
+import java.time.OffsetDateTime;

 /**
 * 微信支付分账通知参数
@@ -77,7 +77,7 @@ public class ProfitSharingConsumeData {
     * <p>
     * Rfc3339标准
     */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
-    private LocalDateTime successTime;
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    private OffsetDateTime successTime;

 }
--- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/RefundConsumeData.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/RefundConsumeData.java
@@ -20,7 +20,7 @@ import cn.felord.payment.wechat.enumeration.RefundStatus;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

-import java.time.LocalDateTime;
+import java.time.OffsetDateTime;

 /**
 * 微信支付退款结果通知解密
@@ -57,8 +57,8 @@ public class RefundConsumeData {
    /**
     * 退款成功时间
     */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
-    private LocalDateTime successTime;
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    private OffsetDateTime successTime;
    /**
     * 退款入账账户
     */
--- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksCreateParams.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksCreateParams.java
@@ -45,12 +45,12 @@ public class StocksCreateParams {
    /**
     * 批次开始时间 rfc 3339   yyyy-MM-ddTHH:mm:ss.sss+TIMEZONE
     */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
    private OffsetDateTime availableBeginTime;
    /**
     * 批次结束时间 rfc 3339   yyyy-MM-ddTHH:mm:ss.sss+TIMEZONE
     */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
    private OffsetDateTime availableEndTime;
    /**
     * 可创建代金券的类型包含预充值和免充值两种类型。此字段用来标识制券 <strong>是否无资金流</strong>
--- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksQueryParams.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksQueryParams.java
@@ -46,13 +46,13 @@ public class StocksQueryParams {
    /**
     * 选填
     * <p>
-     * 起始时间  最终满足格式 {@code yyyy-MM-dd'T'HH:mm:ss.SSSXXX}
+     * 起始时间  最终满足格式 {@code yyyy-MM-dd'T'HH:mm:ssXXX}
     */
    private OffsetDateTime createStartTime;
    /**
     * 选填
     * <p>
-     * 终止时间  最终满足格式 {@code yyyy-MM-dd'T'HH:mm:ss.SSSXXX}
+     * 终止时间  最终满足格式 {@code yyyy-MM-dd'T'HH:mm:ssXXX}
     */
    private OffsetDateTime createEndTime;
    /**
--- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/TransactionConsumeData.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/TransactionConsumeData.java
@@ -21,7 +21,7 @@ import cn.felord.payment.wechat.enumeration.TradeType;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

-import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
 import java.util.List;

 /**
@@ -88,8 +88,8 @@ public class TransactionConsumeData {
    /**
     * 支付完成时间 YYYY-MM-DDTHH:mm:ss+TIMEZONE
     */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
-    private LocalDateTime successTime;
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    private OffsetDateTime successTime;
    /**
     * 在 1.0.0.RELEASE 直接返回了枚举字符串，1.0.2.RELEASE 中变更为枚举
     *
--- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/busifavor/BusiFavorReceiveConsumeData.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/busifavor/BusiFavorReceiveConsumeData.java
@@ -20,7 +20,7 @@ package cn.felord.payment.wechat.v3.model.busifavor;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

-import java.time.LocalDateTime;
+import java.time.OffsetDateTime;

 /**
 * 商家券领券事件回调通知解密
@@ -49,8 +49,8 @@ public class BusiFavorReceiveConsumeData {
    /**
     * 发放时间 rfc 3339  yyyy-MM-ddTHH:mm:ss+TIMEZONE
     */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
-    private LocalDateTime sendTime;
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    private OffsetDateTime sendTime;
    /**
     * 微信用户在appid下的唯一标识。
     */
--- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/busifavor/BusiFavorUseParams.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/busifavor/BusiFavorUseParams.java
@@ -19,7 +19,7 @@ package cn.felord.payment.wechat.v3.model.busifavor;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

-import java.time.LocalDateTime;
+import java.time.OffsetDateTime;

 /**
 * 核销用户券请求参数
@@ -44,8 +44,8 @@ public class BusiFavorUseParams {
    /**
     * 请求核销时间
     */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
-    private LocalDateTime useTime;
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    private OffsetDateTime useTime;
    /**
     * 核销请求单据号,商户侧保证唯一
     */
--- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/busifavor/CouponAvailableTime.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/busifavor/CouponAvailableTime.java
@@ -19,7 +19,7 @@ package cn.felord.payment.wechat.v3.model.busifavor;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

-import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
 import java.util.List;

 /**
@@ -54,13 +54,13 @@ public class CouponAvailableTime {
    /**
     * 批次开始时间 rfc 3339   yyyy-MM-ddTHH:mm:ss+TIMEZONE
     */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
-    private LocalDateTime availableBeginTime;
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    private OffsetDateTime availableBeginTime;
    /**
     * 批次结束时间 rfc 3339  yyyy-MM-ddTHH:mm:ss+TIMEZONE
     */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
-    private LocalDateTime availableEndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    private OffsetDateTime availableEndTime;
    /**
     * 固定周期有效时间段
     */
--- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/busifavor/IrregularyAvaliableTimeItem.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/busifavor/IrregularyAvaliableTimeItem.java
@@ -19,7 +19,8 @@ package cn.felord.payment.wechat.v3.model.busifavor;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

-import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+
 /**
 * 商家券核销规则-券可核销时间-无规律的有效时间段
 *
@@ -32,11 +33,11 @@ public class IrregularyAvaliableTimeItem{
 	/**
 	 * 开始时间
 	 */
-	@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
-	private LocalDateTime beginTime;
+	@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+	private OffsetDateTime beginTime;
 	/**
 	 * 结束时间
 	 */
-	@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
-	private LocalDateTime endTime;
+	@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+	private OffsetDateTime endTime;
 }
--- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineH5PayParams.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineH5PayParams.java
@@ -64,12 +64,12 @@ public class CombineH5PayParams {
    /**
     * 交易起始时间，选填
     */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
    private OffsetDateTime timeStart;
    /**
     * 交易结束时间，选填
     */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
    private OffsetDateTime timeExpire;

 }
--- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombinePayParams.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombinePayParams.java
@@ -64,12 +64,12 @@ public class CombinePayParams {
    /**
     * 交易起始时间，选填
     */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
    private OffsetDateTime timeStart;
    /**
     * 交易结束时间，选填
     */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
    private OffsetDateTime timeExpire;

 }
--- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/parking/ParkingParams.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/parking/ParkingParams.java
@@ -21,7 +21,7 @@ import cn.felord.payment.wechat.enumeration.PlateColor;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

-import java.time.LocalDateTime;
+import java.time.OffsetDateTime;

 /**
 * 创建停车入场API参数
@@ -58,8 +58,8 @@ public class ParkingParams {
     * <p>
     * 格式为yyyy-MM-DDTHH:mm:ss+TIMEZONE
     */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
-    private LocalDateTime startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    private OffsetDateTime startTime;
    /**
     * 停车场名称，必传
     */
--- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/profitsharing/PartnerProfitsharingConsumeData.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/profitsharing/PartnerProfitsharingConsumeData.java
@@ -19,7 +19,7 @@ package cn.felord.payment.wechat.v3.model.profitsharing;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

-import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
 import java.util.List;

 /**
@@ -75,7 +75,7 @@ public class PartnerProfitsharingConsumeData {
     * <p>
     * Rfc3339标准
     */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
-    private LocalDateTime successTime;
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    private OffsetDateTime successTime;

 }
--- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/profitsharing/ProfitsharingConsumeData.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/profitsharing/ProfitsharingConsumeData.java
@@ -19,7 +19,7 @@ package cn.felord.payment.wechat.v3.model.profitsharing;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

-import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
 import java.util.List;

 /**
@@ -69,7 +69,7 @@ public class ProfitsharingConsumeData {
     * <p>
     * Rfc3339标准
     */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
-    private LocalDateTime successTime;
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    private OffsetDateTime successTime;

 }