diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/AliPayStrategy.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/AliPayStrategy.java index 5d50a5a3f..5f1c478b0 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/AliPayStrategy.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/AliPayStrategy.java @@ -3,6 +3,7 @@ package cn.bootx.platform.daxpay.core.pay.strategy; import cn.bootx.platform.common.core.util.BigDecimalUtil; import cn.bootx.platform.daxpay.code.pay.PayChannelEnum; import cn.bootx.platform.daxpay.code.paymodel.AliPayCode; +import cn.bootx.platform.daxpay.core.channel.alipay.dao.AlipayConfigManager; import cn.bootx.platform.daxpay.core.channel.alipay.entity.AlipayConfig; import cn.bootx.platform.daxpay.core.channel.alipay.service.*; import cn.bootx.platform.daxpay.core.pay.exception.ExceptionInfo; @@ -35,6 +36,8 @@ import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROT @RequiredArgsConstructor public class AliPayStrategy extends AbsPayStrategy { + private final AlipayConfigManager alipayConfigManager; + private final AliPaymentService aliPaymentService; private final AlipaySyncService alipaySyncService; @@ -164,7 +167,9 @@ public class AliPayStrategy extends AbsPayStrategy { */ private void initAlipayConfig(String mchAppCode) { // 检查并获取支付宝支付配置 - alipayConfigService.initApiConfigByMchAppCode(mchAppCode); + this.alipayConfig = alipayConfigManager.findByMchAppCode(mchAppCode) + .orElseThrow(() -> new PayFailureException("支付配置不存在")); + alipayConfigService.initApiConfig(this.alipayConfig); } } diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/service/PayRefundService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/service/PayRefundService.java index 2bd052f48..6991fd441 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/service/PayRefundService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/refund/service/PayRefundService.java @@ -115,7 +115,7 @@ public class PayRefundService { // 3.支付前准备 this.doHandler(refundModeParams,payment, payRefundStrategies, AbsPayRefundStrategy::doBeforeRefundHandler, null); - // 3.执行退款 + // 4.执行退款 this.doHandler(refundModeParams,payment, payRefundStrategies, AbsPayRefundStrategy::doRefundHandler, (strategyList, paymentObj) -> { this.paymentHandler(paymentObj, refundModeParams); }); @@ -163,7 +163,7 @@ public class PayRefundService { // 等同strategyList.forEach(payMethod.accept(PaymentStrategy)) strategyList.forEach(refundStrategy); - // 执行操作成功的处理 + // 执行操作成功的处 Optional.ofNullable(successCallback).ifPresent(fun -> fun.accept(strategyList, payment)); } catch (Exception e) {