From dccc105807adf447045c2df2f83150343fa5b015 Mon Sep 17 00:00:00 2001 From: xiafang Date: Thu, 23 Feb 2023 08:53:45 +0800 Subject: [PATCH] =?UTF-8?q?factor:=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E7=A7=BB=E9=99=A4=E6=97=B6=E5=8C=BA?= =?UTF-8?q?=E9=99=90=E5=88=B6=E4=B8=BA=E4=B8=9C=E5=85=AB=E5=8C=BA=EF=BC=8C?= =?UTF-8?q?=E7=94=B1LocalDateTime=E6=94=B9=E4=B8=BAOffsetDateTime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../wechat/v3/model/StocksQueryParams.html | 25 ++++++++++++++++--- apidocs/index-all.html | 21 ++++++++++++++-- docs/README.md | 2 +- docs/quick_start.md | 2 +- payment-spring-boot-autoconfigure/pom.xml | 4 +-- .../wechat/v3/model/AbstractPayParams.java | 6 ++--- .../v3/model/CouponsCardSendParams.java | 2 +- .../v3/model/ProfitSharingConsumeData.java | 6 ++--- .../wechat/v3/model/RefundConsumeData.java | 6 ++--- .../wechat/v3/model/StocksCreateParams.java | 4 +-- .../wechat/v3/model/StocksQueryParams.java | 4 +-- .../v3/model/TransactionConsumeData.java | 6 ++--- .../BusiFavorReceiveConsumeData.java | 6 ++--- .../model/busifavor/BusiFavorUseParams.java | 6 ++--- .../model/busifavor/CouponAvailableTime.java | 10 ++++---- .../IrregularyAvaliableTimeItem.java | 11 ++++---- .../v3/model/combine/CombineH5PayParams.java | 4 +-- .../v3/model/combine/CombinePayParams.java | 4 +-- .../model/payscore/parking/ParkingParams.java | 6 ++--- .../PartnerProfitsharingConsumeData.java | 6 ++--- .../ProfitsharingConsumeData.java | 6 ++--- payment-spring-boot-starter/pom.xml | 4 +-- pom.xml | 2 +- 24 files changed, 95 insertions(+), 60 deletions(-) diff --git a/README.md b/README.md index d32f1d0..b3a2ef9 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Java微信支付V3支付Spring Boot Starter，支持微信优惠券，代金券 cn.felord payment-spring-boot-starter - 1.0.16.RELEASE + 1.0.17.RELEASE ``` ## JDK问题 diff --git a/apidocs/cn/felord/payment/wechat/v3/model/StocksQueryParams.html b/apidocs/cn/felord/payment/wechat/v3/model/StocksQueryParams.html index 5604f60..8e5a3c5 100644 --- a/apidocs/cn/felord/payment/wechat/v3/model/StocksQueryParams.html +++ b/apidocs/cn/felord/payment/wechat/v3/model/StocksQueryParams.html @@ -1,3 +1,20 @@ + + @@ -137,7 +154,7 @@ extends createEndTime
选填 - 终止时间 最终满足格式 yyyy-MM-dd'T'HH:mm:ss.SSSXXX
+ 终止时间 最终满足格式 yyyy-MM-dd'T'HH:mm:ssXXX @@ -145,7 +162,7 @@ extends createStartTime
选填 - 起始时间 最终满足格式 yyyy-MM-dd'T'HH:mm:ss.SSSXXX
+ 起始时间 最终满足格式 yyyy-MM-dd'T'HH:mm:ssXXX @@ -252,7 +269,7 @@ extends OffsetDateTime createStartTime
选填

- 起始时间 最终满足格式 yyyy-MM-dd'T'HH:mm:ss.SSSXXX

+ 起始时间 最终满足格式 yyyy-MM-dd'T'HH:mm:ssXXX @@ -264,7 +281,7 @@ extends OffsetDateTime createEndTime
选填

- 终止时间 最终满足格式 yyyy-MM-dd'T'HH:mm:ss.SSSXXX

+ 终止时间 最终满足格式 yyyy-MM-dd'T'HH:mm:ssXXX diff --git a/apidocs/index-all.html b/apidocs/index-all.html index a8148d6..dddbca6 100644 --- a/apidocs/index-all.html +++ b/apidocs/index-all.html @@ -1,3 +1,20 @@ + + @@ -1780,7 +1797,7 @@
选填 - 终止时间 最终满足格式 yyyy-MM-dd'T'HH:mm:ss.SSSXXX
+ 终止时间 最终满足格式 yyyy-MM-dd'T'HH:mm:ssXXX
createServiceOrder(UserServiceOrderParams) - 类 中的方法cn.felord.payment.wechat.v3.WechatPayScoreApi
@@ -1796,7 +1813,7 @@
选填 - 起始时间 最终满足格式 yyyy-MM-dd'T'HH:mm:ss.SSSXXX
+ 起始时间 最终满足格式 yyyy-MM-dd'T'HH:mm:ssXXX
createStock(BusiFavorCreateParams) - 类 中的方法cn.felord.payment.wechat.v3.WechatMarketingBusiFavorApi
diff --git a/docs/README.md b/docs/README.md index 62977b6..7dc84d4 100644 --- a/docs/README.md +++ b/docs/README.md @@ -35,7 +35,7 @@ cn.felord payment-spring-boot-starter - 1.0.16.RELEASE + 1.0.17.RELEASE ``` ## 采用技术 diff --git a/docs/quick_start.md b/docs/quick_start.md index 474fbf5..3350856 100644 --- a/docs/quick_start.md +++ b/docs/quick_start.md @@ -4,7 +4,7 @@ cn.felord payment-spring-boot-starter - 1.0.16.RELEASE + 1.0.17.RELEASE ``` > 基于 **Spring Boot 2.x** diff --git a/payment-spring-boot-autoconfigure/pom.xml b/payment-spring-boot-autoconfigure/pom.xml index 8086c67..5633c86 100644 --- a/payment-spring-boot-autoconfigure/pom.xml +++ b/payment-spring-boot-autoconfigure/pom.xml @@ -22,11 +22,11 @@ cn.felord payment-spring-boot - 1.0.16.RELEASE + 1.0.17.RELEASE payment-spring-boot-autoconfigure - 1.0.16.RELEASE + 1.0.17.RELEASE jar 4.0.0 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 1ff6d30..fad7ac0 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 @@ -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和支付通知中原样返回，可作为自定义参数使用 */ diff --git 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 index c1657a7..057e901 100644 --- 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; } diff --git 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 index f8f379e..61b2cac 100644 --- 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 { *

* 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; } diff --git 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 index 266ddfb..dee4c55 100644 --- 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; /** * 退款入账账户 */ diff --git 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 index 5d2eb52..18d6bde 100644 --- 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; /** * 可创建代金券的类型包含预充值和免充值两种类型。此字段用来标识制券 是否无资金流 diff --git 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 index 854ef15..23b51e3 100644 --- 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 { /** * 选填 *

- * 起始时间 最终满足格式 {@code yyyy-MM-dd'T'HH:mm:ss.SSSXXX} + * 起始时间 最终满足格式 {@code yyyy-MM-dd'T'HH:mm:ssXXX} */ private OffsetDateTime createStartTime; /** * 选填 *

- * 终止时间 最终满足格式 {@code yyyy-MM-dd'T'HH:mm:ss.SSSXXX} + * 终止时间 最终满足格式 {@code yyyy-MM-dd'T'HH:mm:ssXXX} */ private OffsetDateTime createEndTime; /** diff --git 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 index a247f1e..dec9536 100644 --- 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 中变更为枚举 * diff --git 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 index e43b10d..ad7d66b 100644 --- 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下的唯一标识。 */ 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 ab59f23..024763e 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.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; /** * 核销请求单据号,商户侧保证唯一 */ 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 46e29a5..fdc8010 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.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; /** * 固定周期有效时间段 */ 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 201ca9e..ea70ec1 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,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; } \ No newline at end of file diff --git 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 index a8f7883..1a5d7eb 100644 --- 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; } diff --git 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 index d281b72..73ecd4a 100644 --- 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; } 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 081b206..94f8343 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 @@ -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 { *

* 格式为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; /** * 停车场名称，必传 */ diff --git 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 index a871827..5082f60 100644 --- 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 { *

* 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; } diff --git 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 index 091cb93..559452b 100644 --- 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 { *

* 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; } diff --git a/payment-spring-boot-starter/pom.xml b/payment-spring-boot-starter/pom.xml index 9522519..d02ac7a 100644 --- a/payment-spring-boot-starter/pom.xml +++ b/payment-spring-boot-starter/pom.xml @@ -22,11 +22,11 @@ cn.felord payment-spring-boot - 1.0.16.RELEASE + 1.0.17.RELEASE payment-spring-boot-starter - 1.0.16.RELEASE + 1.0.17.RELEASE jar 4.0.0 diff --git a/pom.xml b/pom.xml index e7a93be..40fe902 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> cn.felord payment-spring-boot - 1.0.16.RELEASE + 1.0.17.RELEASE pom 4.0.0