From 977a6b33a40a5d6103b43cc3acd8708f532a647d Mon Sep 17 00:00:00 2001 From: "felord.cn" Date: Thu, 4 Feb 2021 21:18:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98V3?= =?UTF-8?q?=E9=80=80=E6=AC=BE=E6=B5=8B=E8=AF=95=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #8 --- .../wechat/enumeration/RefundStatus.java | 38 +++++++++++++++++++ .../payment/wechat/v3/WechatDirectPayApi.java | 2 + .../payment/wechat/v3/WechatPayCallback.java | 6 +-- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/RefundStatus.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/RefundStatus.java index d3bc755..ca8536d 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/RefundStatus.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/RefundStatus.java @@ -18,8 +18,46 @@ package cn.felord.payment.wechat.enumeration; /** + * 退款成功事件. + * * @author felord.cn * @since 1.0.6.RELEASE */ public enum RefundStatus { + /** + * 退款异常事件. + * + * @since 1.0.6.RELEASE + */ + ABNORMAL("REFUND.ABNORMAL"), + + /** + * 退款关闭事件. + * + * @since 1.0.6.RELEASE + */ + CLOSED("REFUND.CLOSED"), + /** + * 支付成功事件. + * + * @since 1.0.0.RELEASE + */ + TRANSACTION("TRANSACTION.SUCCESS"); + /** + * The Event. + */ + private final String refundStatus; + + /** + * Instantiates a new Event type. + * + * @param refundStatus the event + */ + RefundStatus(String refundStatus) { + this.refundStatus = refundStatus; + } + + public String getRefundStatus() { + return refundStatus; + } } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatDirectPayApi.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatDirectPayApi.java index d25793a..f3ba6a7 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatDirectPayApi.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatDirectPayApi.java @@ -280,6 +280,8 @@ public class WechatDirectPayApi extends AbstractApi { URI uri = UriComponentsBuilder.fromHttpUrl(type.uri(WeChatServer.CHINA)) .build() .toUri(); + WechatPayProperties.V3 v3 = this.wechatMetaBean().getV3(); + params.setNotifyUrl(v3.getDomain().concat(params.getNotifyUrl())); return Post(uri, params); })) .consumer(wechatResponseEntity::convert) 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 df3024a..b1b705b 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 @@ -283,9 +283,9 @@ public class WechatPayCallback { CallbackParams callbackParams = resolve(params); String eventType = callbackParams.getEventType(); - if (!Objects.equals(eventType, EventType.REFUND_CLOSED.event)|| - !Objects.equals(eventType,EventType.REFUND_ABNORMAL.event)|| - !Objects.equals(eventType,EventType.REFUND_SUCCESS.event)) { + if (!(Objects.equals(eventType, EventType.REFUND_CLOSED.event) || + Objects.equals(eventType, EventType.REFUND_ABNORMAL.event) || + Objects.equals(eventType, EventType.REFUND_SUCCESS.event))) { log.error("wechat pay event type is not matched, callbackParams {}", callbackParams); throw new PayException(" wechat pay event type is not matched"); }