From 205cdce2beabb76157f0fcf3bbcea51ea434583c Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 17 Aug 2023 14:50:59 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=87=8D=E8=AF=95=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=80=80=E6=AC=BE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsowell/adapay/service/AdapayMemberService.java | 4 ++-- .../jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java index 2a44ce0f9..3b286b21c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java @@ -701,7 +701,7 @@ public class AdapayMemberService { * * @return */ - public List queryPaymentReverse(String paymentId, String wechatAppId) throws BaseAdaPayException { + public List queryPaymentReverse(String paymentId, String wechatAppId) throws BaseAdaPayException { AbstractAdapayConfig config = AdapayConfigFactory.getConfig(wechatAppId); if (config == null) { throw new BusinessException(ReturnCodeEnum.CODE_ADAPAY_CONFIG_IS_NULL_ERROR); @@ -711,7 +711,7 @@ public class AdapayMemberService { reverse.put("app_id", config.getAdapayAppId()); Map response = PaymentReverse.queryList(reverse, config.getWechatAppId()); JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(response)); - List payment_reverses = jsonObject.getList("payment_reverses", PaymentReverse.class); + List payment_reverses = jsonObject.getList("payment_reverses", PaymentReverseResponse.class); return payment_reverses; } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 0715c446e..1e08d5bdb 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -12,7 +12,6 @@ import com.google.common.collect.Sets; import com.huifu.adapay.core.exception.BaseAdaPayException; import com.huifu.adapay.model.Payment; import com.huifu.adapay.model.PaymentConfirm; -import com.huifu.adapay.model.PaymentReverse; import com.jsowell.adapay.common.CreateAdaPaymentParam; import com.jsowell.adapay.common.DivMember; import com.jsowell.adapay.config.AbstractAdapayConfig; @@ -2796,14 +2795,14 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { String paymentId = adapayCallbackRecord.getPaymentId(); String memberId = orderBasicInfo.getMemberId(); BigDecimal refundAmount = orderBasicInfo.getRefundAmount(); - List paymentReverses = adapayMemberService.queryPaymentReverse(paymentId, wechatAppId); + List paymentReverses = adapayMemberService.queryPaymentReverse(paymentId, wechatAppId); if (CollectionUtils.isEmpty(paymentReverses)) { // 如果没有退款过，重新执行一遍退款 PaymentReverseResponse response = adapayMemberService.createPaymentReverseRequest( paymentId, refundAmount, wechatAppId, memberId, ScenarioEnum.ORDER.getValue(), orderCode); + logger.info("重试订单退款response:{}", JSON.toJSONString(response)); } - } /**