From 277a1223c52a3b71a3443cb6c8b2a4404ad6c01f Mon Sep 17 00:00:00 2001 From: felord Date: Wed, 31 Mar 2021 14:53:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BE=AE=E4=BF=A1native=E6=94=AF?= =?UTF-8?q?=E4=BB=98v3=E9=80=9A=E7=9F=A5=E5=9B=9E=E8=B0=83successTime?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=97=A0=E6=97=B6=E5=8C=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes I3ED43 --- .../java/cn/felord/payment/wechat/v3/WechatPayCallback.java | 2 +- .../payment/wechat/v3/model/ProfitSharingConsumeData.java | 5 +++-- .../cn/felord/payment/wechat/v3/model/RefundConsumeData.java | 4 ++-- .../payment/wechat/v3/model/TransactionConsumeData.java | 4 ++-- .../v3/model/busifavor/BusiFavorReceiveConsumeData.java | 4 ++-- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayCallback.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayCallback.java index 35b2c59..f6789a8 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayCallback.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayCallback.java @@ -101,7 +101,7 @@ public class WechatPayCallback { */ @SneakyThrows public Map profitSharingCallback(ResponseSignVerifyParams params, Consumer consumeDataConsumer) { - String data = this.callback(params, EventType.COUPON_USE); + String data = this.callback(params, EventType.TRANSACTION); ProfitSharingConsumeData consumeData = MAPPER.readValue(data, ProfitSharingConsumeData.class); consumeDataConsumer.accept(consumeData); Map responseBody = new HashMap<>(2); 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 613d13d..d0edeb3 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 @@ -22,11 +22,12 @@ import cn.felord.payment.wechat.v2.model.allocation.Receiver; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import java.time.OffsetDateTime; +import java.time.LocalDateTime; /** * 微信支付分账通知参数 * + * @author wangzecheng * @since 1.0.10.RELEASE */ @Data @@ -71,6 +72,6 @@ public class ProfitSharingConsumeData { * Rfc3339标准 */ @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8") - private OffsetDateTime successTime; + private LocalDateTime 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 a9a942f..f983733 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 @@ -22,7 +22,7 @@ import cn.felord.payment.wechat.enumeration.RefundStatus; import com.fasterxml.jackson.annotation.JsonFormat; 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") - private OffsetDateTime successTime; + private LocalDateTime successTime; /** * 退款入账账户 */ 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 a9fe1f7..8d070a9 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 @@ -23,7 +23,7 @@ import cn.felord.payment.wechat.enumeration.TradeType; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import java.time.OffsetDateTime; +import java.time.LocalDateTime; import java.util.List; /** @@ -91,7 +91,7 @@ public class TransactionConsumeData { * 支付完成时间 YYYY-MM-DDTHH:mm:ss+TIMEZONE */ @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 中变更为枚举 * 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 2560165..bdd250b 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.OffsetDateTime; +import java.time.LocalDateTime; /** * 商家券领券事件回调通知解密 @@ -50,7 +50,7 @@ public class BusiFavorReceiveConsumeData { * 发放时间 rfc 3339 yyyy-MM-ddTHH:mm:ss+TIMEZONE */ @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssXXX", timezone = "GMT+8") - private OffsetDateTime sendTime; + private LocalDateTime sendTime; /** * 微信用户在appid下的唯一标识。 */