open-source/payment-spring-boot
1
0
Fork 0
mirror of https://github.com/dromara/payment-spring-boot.git synced 2026-03-17 23:43:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 微信native支付v3通知回调successTime字段无时区信息

Browse Source 
Closes I3ED43
This commit is contained in:
felord
2021-03-31 14:53:38 +08:00
parent 6086dd5101
commit 277a1223c5
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,7 +101,7 @@ public class WechatPayCallback {
*/ */
@SneakyThrows @SneakyThrows
public Map<String, ?> profitSharingCallback(ResponseSignVerifyParams params, Consumer<ProfitSharingConsumeData> consumeDataConsumer) { public Map<String, ?> profitSharingCallback(ResponseSignVerifyParams params, Consumer<ProfitSharingConsumeData> consumeDataConsumer) {
String data = this.callback(params, EventType.COUPON_USE); String data = this.callback(params, EventType.TRANSACTION);
ProfitSharingConsumeData consumeData = MAPPER.readValue(data, ProfitSharingConsumeData.class); ProfitSharingConsumeData consumeData = MAPPER.readValue(data, ProfitSharingConsumeData.class);
consumeDataConsumer.accept(consumeData); consumeDataConsumer.accept(consumeData);
Map<String, Object> responseBody = new HashMap<>(2); Map<String, Object> responseBody = new HashMap<>(2);

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

@@ -22,11 +22,12 @@ import cn.felord.payment.wechat.v2.model.allocation.Receiver;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.time.OffsetDateTime; import java.time.LocalDateTime;
/** /**
* 微信支付分账通知参数 * 微信支付分账通知参数
* *
* @author wangzecheng
* @since 1.0.10.RELEASE * @since 1.0.10.RELEASE
*/ */
@Data @Data
@@ -71,6 +72,6 @@ public class ProfitSharingConsumeData {
* Rfc3339标准 * Rfc3339标准
*/ */
@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
private OffsetDateTime successTime; private LocalDateTime successTime;
} }

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

@@ -22,7 +22,7 @@ import cn.felord.payment.wechat.enumeration.RefundStatus;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.time.OffsetDateTime; import java.time.LocalDateTime;
/** /**
* 微信支付退款结果通知解密 * 微信支付退款结果通知解密
@@ -60,7 +60,7 @@ public class RefundConsumeData {
* 退款成功时间 * 退款成功时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
private OffsetDateTime successTime; private LocalDateTime successTime;
/** /**
* 退款入账账户 * 退款入账账户
*/ */

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

@@ -23,7 +23,7 @@ import cn.felord.payment.wechat.enumeration.TradeType;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.time.OffsetDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
/** /**
@@ -91,7 +91,7 @@ public class TransactionConsumeData {
* 支付完成时间 YYYY-MM-DDTHH:mm:ss+TIMEZONE * 支付完成时间 YYYY-MM-DDTHH:mm:ss+TIMEZONE
*/ */
@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
private OffsetDateTime successTime; private LocalDateTime successTime;
/** /**
* 在 1.0.0.RELEASE 直接返回了枚举字符串，1.0.2.RELEASE 中变更为枚举 * 在 1.0.0.RELEASE 直接返回了枚举字符串，1.0.2.RELEASE 中变更为枚举
* *

4
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 com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.time.OffsetDateTime; import java.time.LocalDateTime;
/** /**
* 商家券领券事件回调通知解密 * 商家券领券事件回调通知解密
@@ -50,7 +50,7 @@ public class BusiFavorReceiveConsumeData {
* 发放时间 rfc 3339 yyyy-MM-ddTHH:mm:ss+TIMEZONE * 发放时间 rfc 3339 yyyy-MM-ddTHH:mm:ss+TIMEZONE
*/ */
@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8")
private OffsetDateTime sendTime; private LocalDateTime sendTime;
/** /**
* 微信用户在appid下的唯一标识。 * 微信用户在appid下的唯一标识。
*/ */