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());