From 05a3e83e3ef4f76cda47568c493ee7f1667e4f30 Mon Sep 17 00:00:00 2001
From: Fang <felord@qq.com>
Date: Wed, 5 Oct 2022 13:17:06 +0800
Subject: [PATCH] =?UTF-8?q?enhance:=20=E8=AE=A2=E5=8D=95=E5=A4=B1=E6=95=88?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=8E=B0=E5=9C=A8=E9=9C=80=E8=A6=81=E4=BB=A5?=
 =?UTF-8?q?java=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8FLocalDateTime=E4=BC=A0?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#66
---
 .../cn/felord/payment/wechat/enumeration/ContactType.java | 4 ++--
 .../java/cn/felord/payment/wechat/v3/AbstractApi.java     | 3 +--
 .../felord/payment/wechat/v3/model/AbstractPayParams.java | 8 ++++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/ContactType.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/ContactType.java
index 18e21ac..61e2cde 100644
--- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/ContactType.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/ContactType.java
@@ -20,7 +20,7 @@ package cn.felord.payment.wechat.enumeration;
 /**
  * 超级管理员类型
  *
- * @since
+ * @since 1.0.14.RELEASE
  */
 public enum ContactType {
     /**
@@ -31,7 +31,7 @@ public enum ContactType {
     LEGAL,
     /**
      * 经办人
-     *
+     * <p>
      * 经商户授权办理微信支付业务的人员
      */
     SUPER
diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/AbstractApi.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/AbstractApi.java
index 6914ffd..7a635da 100644
--- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/AbstractApi.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/AbstractApi.java
@@ -94,8 +94,7 @@ public abstract class AbstractApi {
      * @param mapper the mapper
      */
     private void applyObjectMapper(ObjectMapper mapper) {
-        mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE
-                )
+        mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
                 .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
                 // empty string error
                 .configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, true)
diff --git 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
index 936ead0..1f27334 100644
--- 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
@@ -17,8 +17,11 @@
 
 package cn.felord.payment.wechat.v3.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /**
  * @author felord.cn
  * @since 1.0.8.RELEASE
@@ -37,9 +40,10 @@ public abstract class AbstractPayParams {
      */
     private String outTradeNo;
     /**
-     * 订单失效时间 YYYY-MM-DDTHH:mm:ss+TIMEZONE
+     * 订单失效时间 rfc 3339 YYYY-MM-DDTHH:mm:ss+TIMEZONE
      */
-    private String timeExpire;
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
+    private LocalDateTime timeExpire;
     /**
      * 附加数据，在查询API和支付通知中原样返回，可作为自定义参数使用
      */