From 9c4061ce8151a3483292937d8aeed0740076176b Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 23 Apr 2021 17:55:57 +0800 Subject: [PATCH] fix cashout --- .../pay/service/cashout/wx/WxCashOutAdapterService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/WxCashOutAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/WxCashOutAdapterService.java index 7d2e45891..d2f4a8649 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/WxCashOutAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/WxCashOutAdapterService.java @@ -194,6 +194,9 @@ public class WxCashOutAdapterService implements CashOutAdapterService{ */ @Override public CashOutAdapterResult cashOut(WxAppinfo appInfo, WxPayAccount payAccount, WxCashOut cashOut) { + if (StringUtils.isBlank(payAccount.getMerchantCertPath())) { + return new CashOutAdapterResult(false, EnumCashOutStatus.FAIL.getCode(), "零钱支付失败。商户证书为空。请联系管理员配置。", null); + } WxCashOutP wxCashOutP = generateWxCashOutP(payAccount, appInfo, cashOut); Map signMap = null; try { @@ -259,6 +262,9 @@ public class WxCashOutAdapterService implements CashOutAdapterService{ @Override public CashOutAdapterResult queryCashOut(WxAppinfo appInfo, WxPayAccount payAccount, WxCashOut cashOut) { + if (StringUtils.isBlank(payAccount.getMerchantCertPath())) { + return new CashOutAdapterResult(false, EnumCashOutStatus.FAIL.getCode(), "零钱支付失败。商户证书为空。请联系管理员配置。", null); + } WxCashOutQueryP wxCashOutP = generateQueryWxCashOutP(payAccount, appInfo, cashOut); Map signMap = null; try { @@ -272,7 +278,7 @@ public class WxCashOutAdapterService implements CashOutAdapterService{ signMap.put("sign", signAgent); String response = null; try { - response = WxPay.getTransferInfo(signMap, payAccount.getCertPath(), payAccount.getMchId()); + response = WxPay.getTransferInfo(signMap, payAccount.getMerchantCertPath(), payAccount.getSubMchId()); } catch (Exception e) { log.error("零钱支付查询异常: " + e.getMessage(),e); throw new MallinkException(ErrorCode.REFUND_ORDER_ERROR.getCode(), "微信零钱支付查询接口异常");