open-source/payment-spring-boot
1
0
Fork 0
mirror of https://github.com/dromara/payment-spring-boot.git synced 2026-04-05 05:07:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
xiafang
2023-02-23 08:53:45 +08:00
parent 2fa018a0c9
commit dccc105807
24 changed files with 95 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -41,7 +41,7 @@ Java微信支付V3支付Spring Boot Starter，支持微信优惠券，代金券
<dependency>
<groupId>cn.felord</groupId>
<artifactId>payment-spring-boot-starter</artifactId>
<version>1.0.16.RELEASE</version>
<version>1.0.17.RELEASE</version>
</dependency>
```
## JDK问题

25
apidocs/cn/felord/payment/wechat/v3/model/StocksQueryParams.html
View File

@@ -1,3 +1,20 @@
<!--
~ Copyright 2019-2022 felord.cn
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ https://www.apache.org/licenses/LICENSE-2.0
~ Website:
~ https://felord.cn
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!-- NewPage -->
<html lang="zh">
@@ -137,7 +154,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../cn/felord/payment/wechat/v3/model/StocksQueryParams.html#createEndTime">createEndTime</a></span></code>
<div class="block">选填
终止时间 最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ss.SSSXXX</code></div>
终止时间 最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ssXXX</code></div>
</td>
</tr>
<tr class="rowColor">
@@ -145,7 +162,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../cn/felord/payment/wechat/v3/model/StocksQueryParams.html#createStartTime">createStartTime</a></span></code>
<div class="block">选填
起始时间 最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ss.SSSXXX</code></div>
起始时间 最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ssXXX</code></div>
</td>
</tr>
<tr class="altColor">
@@ -252,7 +269,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/time/OffsetDateTime.html?is-external=true" title="java.time中的类或接口">OffsetDateTime</a> createStartTime</pre>
<div class="block">选填
<p>
起始时间 最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ss.SSSXXX</code></div>
起始时间 最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ssXXX</code></div>
</li>
</ul>
<a name="createEndTime">
@@ -264,7 +281,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/time/OffsetDateTime.html?is-external=true" title="java.time中的类或接口">OffsetDateTime</a> createEndTime</pre>
<div class="block">选填
<p>
终止时间 最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ss.SSSXXX</code></div>
终止时间 最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ssXXX</code></div>
</li>
</ul>
<a name="status">

21
apidocs/index-all.html
View File

@@ -1,3 +1,20 @@
<!--
~ Copyright 2019-2022 felord.cn
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ https://www.apache.org/licenses/LICENSE-2.0
~ Website:
~ https://felord.cn
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!-- NewPage -->
<html lang="zh">
@@ -1780,7 +1797,7 @@
<dd>
<div class="block">选填
终止时间 最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ss.SSSXXX</code></div>
终止时间 最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ssXXX</code></div>
</dd>
<dt><span class="memberNameLink"><a href="cn/felord/payment/wechat/v3/WechatPayScoreApi.html#createServiceOrder-cn.felord.payment.wechat.v3.model.payscore.UserServiceOrderParams-">createServiceOrder(UserServiceOrderParams)</a></span> - 类 中的方法cn.felord.payment.wechat.v3.<a href="cn/felord/payment/wechat/v3/WechatPayScoreApi.html" title="cn.felord.payment.wechat.v3中的类">WechatPayScoreApi</a></dt>
<dd>
@@ -1796,7 +1813,7 @@
<dd>
<div class="block">选填
起始时间 最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ss.SSSXXX</code></div>
起始时间 最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ssXXX</code></div>
</dd>
<dt><span class="memberNameLink"><a href="cn/felord/payment/wechat/v3/WechatMarketingBusiFavorApi.html#createStock-cn.felord.payment.wechat.v3.model.busifavor.BusiFavorCreateParams-">createStock(BusiFavorCreateParams)</a></span> - 类 中的方法cn.felord.payment.wechat.v3.<a href="cn/felord/payment/wechat/v3/WechatMarketingBusiFavorApi.html" title="cn.felord.payment.wechat.v3中的类">WechatMarketingBusiFavorApi</a></dt>
<dd>

2
docs/README.md
View File

@@ -35,7 +35,7 @@
<dependency>
<groupId>cn.felord</groupId>
<artifactId>payment-spring-boot-starter</artifactId>
<version>1.0.16.RELEASE</version>
<version>1.0.17.RELEASE</version>
</dependency>
```
## 采用技术

2
docs/quick_start.md
View File

@@ -4,7 +4,7 @@
<dependency>
<groupId>cn.felord</groupId>
<artifactId>payment-spring-boot-starter</artifactId>
<version>1.0.16.RELEASE</version>
<version>1.0.17.RELEASE</version>
</dependency>
```
> 基于 **Spring Boot 2.x**

4
payment-spring-boot-autoconfigure/pom.xml
View File

@@ -22,11 +22,11 @@
<parent>
<groupId>cn.felord</groupId>
<artifactId>payment-spring-boot</artifactId>
<version>1.0.16.RELEASE</version>
<version>1.0.17.RELEASE</version>
</parent>
<artifactId>payment-spring-boot-autoconfigure</artifactId>
<version>1.0.16.RELEASE</version>
<version>1.0.17.RELEASE</version>
<packaging>jar</packaging>
<modelVersion>4.0.0</modelVersion>

6
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/AbstractPayParams.java
View File

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

2
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponsCardSendParams.java
View File

@@ -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;
}

6
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/ProfitSharingConsumeData.java
View File

@@ -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;
}

6
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/RefundConsumeData.java
View File

@@ -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;
/**
* 退款入账账户
*/

4
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksCreateParams.java
View File

@@ -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>

4
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksQueryParams.java
View File

@@ -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;
/**

6
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/TransactionConsumeData.java
View File

@@ -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 中变更为枚举
*

6
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/busifavor/BusiFavorReceiveConsumeData.java
View File

@@ -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下的唯一标识。
*/

6
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/busifavor/BusiFavorUseParams.java
View File

@@ -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;
/**
* 核销请求单据号,商户侧保证唯一
*/

10
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/busifavor/CouponAvailableTime.java
View File

@@ -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;
/**
* 固定周期有效时间段
*/

11
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/busifavor/IrregularyAvaliableTimeItem.java
View File

@@ -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;
}

4
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineH5PayParams.java
View File

@@ -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;
}

4
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombinePayParams.java
View File

@@ -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;
}

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

@@ -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;
/**
* 停车场名称，必传
*/

6
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/profitsharing/PartnerProfitsharingConsumeData.java
View File

@@ -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;
}

6
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/profitsharing/ProfitsharingConsumeData.java
View File

@@ -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;
}

4
payment-spring-boot-starter/pom.xml
View File

@@ -22,11 +22,11 @@
<parent>
<groupId>cn.felord</groupId>
<artifactId>payment-spring-boot</artifactId>
<version>1.0.16.RELEASE</version>
<version>1.0.17.RELEASE</version>
</parent>
<artifactId>payment-spring-boot-starter</artifactId>
<version>1.0.16.RELEASE</version>
<version>1.0.17.RELEASE</version>
<packaging>jar</packaging>
<modelVersion>4.0.0</modelVersion>

2
pom.xml
View File

@@ -21,7 +21,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>cn.felord</groupId>
<artifactId>payment-spring-boot</artifactId>
<version>1.0.16.RELEASE</version>
<version>1.0.17.RELEASE</version>
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>