Merge remote-tracking branch 'origin/1.0.15' into 1.0.15

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

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)

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和支付通知中原样返回，可作为自定义参数使用
      */

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.OffsetDateTime;
+import java.time.LocalDateTime;
 
 /**
  * 核销用户券请求参数
@@ -45,7 +45,7 @@ public class BusiFavorUseParams {
      * 请求核销时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
-    private OffsetDateTime useTime;
+    private LocalDateTime useTime;
     /**
      * 核销请求单据号,商户侧保证唯一
      */

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.OffsetDateTime;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -55,12 +55,12 @@ public class CouponAvailableTime {
      * 批次开始时间 rfc 3339   yyyy-MM-ddTHH:mm:ss+TIMEZONE
      */
     @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
-    private OffsetDateTime availableBeginTime;
+    private LocalDateTime availableBeginTime;
     /**
      * 批次结束时间 rfc 3339  yyyy-MM-ddTHH:mm:ss+TIMEZONE
      */
     @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
-    private OffsetDateTime availableEndTime;
+    private LocalDateTime availableEndTime;
     /**
      * 固定周期有效时间段
      */

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/busifavor/IrregularyAvaliableTimeItem.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.OffsetDateTime;
+import java.time.LocalDateTime;
 /**
  * 商家券核销规则-券可核销时间-无规律的有效时间段
  *
@@ -33,10 +33,10 @@ public class IrregularyAvaliableTimeItem{
 	 * 开始时间
 	 */
 	@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
-	private OffsetDateTime beginTime;
+	private LocalDateTime beginTime;
 	/**
 	 * 结束时间
 	 */
 	@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
-	private OffsetDateTime endTime;
+	private LocalDateTime endTime;
 }

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/parking/ParkingParams.java

@@ -18,9 +18,10 @@
 package cn.felord.payment.wechat.v3.model.payscore.parking;
 
 import cn.felord.payment.wechat.enumeration.PlateColor;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import java.time.OffsetDateTime;
+import java.time.LocalDateTime;
 
 /**
  * 创建停车入场API参数
@@ -57,7 +58,8 @@ public class ParkingParams {
      * <p>
      * 格式为yyyy-MM-DDTHH:mm:ss+TIMEZONE
      */
-    private OffsetDateTime startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
+    private LocalDateTime startTime;
     /**
      * 停车场名称，必传
      */

pom.xml

@@ -71,7 +71,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <spring-boot.version>2.7.0</spring-boot.version>
+        <spring-boot.version>2.7.4</spring-boot.version>
         <alipay-sdk.version>4.31.7.ALL</alipay-sdk.version>
         <bcprov.version>1.67</bcprov.version>
     </properties>