From f2dc500d2a07049c34153fd7c06fb4bad532be23 Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 2 Aug 2022 23:03:26 +0800 Subject: [PATCH 1/2] fix cashout --- .../main/java/com/iformall/utils/MaUtil.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/utils/MaUtil.java b/mallinkService/src/main/java/com/iformall/utils/MaUtil.java index d0e8269fe..97d12d7b7 100644 --- a/mallinkService/src/main/java/com/iformall/utils/MaUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/MaUtil.java @@ -103,13 +103,6 @@ public class MaUtil { //@isService 是否服务商模式 private WxPayService getWxPayService(WxAppinfo appinfo, WxPayAccount payAccount,boolean isService) { WxPayConfig config = new WxPayConfig(); - config.setAppId(appinfo.getAppId()); - config.setMchId(payAccount.getMchId()); - config.setMchKey(payAccount.getApiKey()); - config.setSubAppId(appinfo.getAppId()); - config.setSubMchId(payAccount.getSubMchId()); - config.setKeyPath(payAccount.getCertPath()); - //以下是apiv3以及支付分相关 // config.setServiceId(payAccount.getServiceId()); // config.setPayScoreNotifyUrl(payAccount.getPayScoreNotifyUrl()); @@ -117,11 +110,23 @@ public class MaUtil { int iss = 0; if (isService) { iss = 1; + config.setAppId(appinfo.getAppId()); + config.setMchId(payAccount.getMchId()); + config.setMchKey(payAccount.getApiKey()); + config.setSubAppId(appinfo.getAppId()); + config.setSubMchId(payAccount.getSubMchId()); + config.setKeyPath(payAccount.getCertPath()); config.setPrivateKeyPath(payAccount.getPrivateKeyPath()); config.setPrivateCertPath(payAccount.getPrivateCertPath()); //config.setCertSerialNo(payAccount.getCertSerialNo()); config.setApiV3Key(payAccount.getApiV3Key()); }else { + config.setAppId(appinfo.getAppId()); + config.setMchId(payAccount.getSubMchId()); + config.setMchKey(payAccount.getMerchantApiKey()); + config.setSubAppId(appinfo.getAppId()); + config.setSubMchId(payAccount.getSubMchId()); + config.setKeyPath(payAccount.getMerchantKeyPath()); config.setPrivateKeyPath(payAccount.getMerchantKeyPath()); config.setPrivateCertPath(payAccount.getMerchantCertPath()); //config.setCertSerialNo(payAccount.getCertSerialNo()); From 0bb9f9eab6ceaf243e690aecd0a4aa222820adaf Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 2 Aug 2022 23:14:12 +0800 Subject: [PATCH 2/2] fix cashout --- .../service/pay/service/cashout/wx/WxCashOutAdapterService.java | 2 +- 1 file changed, 1 insertion(+), 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 be2f2c73d..5133d098b 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 @@ -214,7 +214,7 @@ public class WxCashOutAdapterService implements CashOutAdapterService{ return new CashOutAdapterResult(false, EnumCashOutStatus.FAIL.getCode(), "零钱支付失败。商户密钥ApiV3为空。请联系管理员配置。", null); } - WxPayService payService = maUtil.getWxPayServiceBySelfModel(appInfo,payAccount); + WxPayService payService = maUtil.getWxPayService(appInfo,payAccount); if (null == payService) { return new CashOutAdapterResult(false, EnumCashOutStatus.FAIL.getCode(), "零钱支付失败。当前小程序未查询到payService。", null); }