From 6e4bfd219231d77b2aad74d0c6688952cd31d268 Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 5 Oct 2022 12:13:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?enhance:=20rfc=203339=20=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wechat/v3/model/busifavor/BusiFavorUseParams.java | 4 ++-- .../wechat/v3/model/busifavor/CouponAvailableTime.java | 6 +++--- .../v3/model/busifavor/IrregularyAvaliableTimeItem.java | 6 +++--- .../wechat/v3/model/payscore/parking/ParkingParams.java | 6 ++++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git 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 index 75729ec..ab59f23 100644 --- 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.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; /** * 核销请求单据号,商户侧保证唯一 */ diff --git 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 index 5ba26c5..46e29a5 100644 --- 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.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; /** * 固定周期有效时间段 */ diff --git 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 index c9fdcc6..201ca9e 100644 --- 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,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; } \ No newline at end of file diff --git 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 index a3276dc..081b206 100644 --- 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 @@ -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 { *

* 格式为yyyy-MM-DDTHH:mm:ss+TIMEZONE */ - private OffsetDateTime startTime; + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8") + private LocalDateTime startTime; /** * 停车场名称，必传 */ From 9b4193a4f97ceb52c26a809fb7684b9c7aa9bd99 Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 5 Oct 2022 12:25:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?upgrade:=20spring=20boot=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8D=87=E7=BA=A7=E5=88=B02.7.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e9c5f60..86f1602 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ UTF-8 UTF-8 1.8 - 2.7.0 + 2.7.4 4.31.7.ALL 1.67 From 2f7e6c6b22948f5d9ab3c2d13ecd03bb20bfad08 Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 5 Oct 2022 13:17:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?enhance:=20=E8=AE=A2=E5=8D=95=E5=A4=B1?= =?UTF-8?q?=E6=95=88=E6=97=B6=E9=97=B4=E7=8E=B0=E5=9C=A8=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E4=BB=A5java=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8FLocalDateTime?= =?UTF-8?q?=E4=BC=A0=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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, /** * 经办人 - * + *

* 经商户授权办理微信支付业务的人员 */ 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和支付通知中原样返回，可作为自定义参数使用 */ From 05a3e83e3ef4f76cda47568c493ee7f1667e4f30 Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 5 Oct 2022 13:17:06 +0800 Subject: [PATCH 4/4] =?UTF-8?q?enhance:=20=E8=AE=A2=E5=8D=95=E5=A4=B1?= =?UTF-8?q?=E6=95=88=E6=97=B6=E9=97=B4=E7=8E=B0=E5=9C=A8=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E4=BB=A5java=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8FLocalDateTime?= =?UTF-8?q?=E4=BC=A0=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, /** * 经办人 - * + *

* 经商户授权办理微信支付业务的人员 */ 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和支付通知中原样返回，可作为自定义参数使用 */