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

Merge branch 'release_toaliyun_real_202207' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202207

release_toaliyun_real
zhengfangyuan 3 лет назад
Родитель
Сommit
ba97f66f1a
2 измененных файлов: 13 добавлений и 8 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/WxCashOutAdapterService.java
  2. +12
    -7
      mallinkService/src/main/java/com/iformall/utils/MaUtil.java

+ 1
- 1
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);
}


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


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