Просмотр исходного кода

fix cashout

release_toaliyun_real
winter 3 лет назад
Родитель
Сommit
f2dc500d2a
1 измененных файлов: 12 добавлений и 7 удалений
  1. +12
    -7
      mallinkService/src/main/java/com/iformall/utils/MaUtil.java

+ 12
- 7
mallinkService/src/main/java/com/iformall/utils/MaUtil.java Просмотреть файл

@@ -103,13 +103,6 @@ public class MaUtil {
//@isService 是否服务商模式 //@isService 是否服务商模式
private WxPayService getWxPayService(WxAppinfo appinfo, WxPayAccount payAccount,boolean isService) { private WxPayService getWxPayService(WxAppinfo appinfo, WxPayAccount payAccount,boolean isService) {
WxPayConfig config = new WxPayConfig(); 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以及支付分相关 //以下是apiv3以及支付分相关
// config.setServiceId(payAccount.getServiceId()); // config.setServiceId(payAccount.getServiceId());
// config.setPayScoreNotifyUrl(payAccount.getPayScoreNotifyUrl()); // config.setPayScoreNotifyUrl(payAccount.getPayScoreNotifyUrl());
@@ -117,11 +110,23 @@ public class MaUtil {
int iss = 0; int iss = 0;
if (isService) { if (isService) {
iss = 1; 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.setPrivateKeyPath(payAccount.getPrivateKeyPath());
config.setPrivateCertPath(payAccount.getPrivateCertPath()); config.setPrivateCertPath(payAccount.getPrivateCertPath());
//config.setCertSerialNo(payAccount.getCertSerialNo()); //config.setCertSerialNo(payAccount.getCertSerialNo());
config.setApiV3Key(payAccount.getApiV3Key()); config.setApiV3Key(payAccount.getApiV3Key());
}else { }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.setPrivateKeyPath(payAccount.getMerchantKeyPath());
config.setPrivateCertPath(payAccount.getMerchantCertPath()); config.setPrivateCertPath(payAccount.getMerchantCertPath());
//config.setCertSerialNo(payAccount.getCertSerialNo()); //config.setCertSerialNo(payAccount.getCertSerialNo());


Загрузка…
Отмена
Сохранить