yh пре 1 месец
родитељ
комит
8563d5bda3

+ 6 - 0
fs-service/src/main/java/com/fs/his/service/impl/MerchantAppConfigServiceImpl.java

@@ -131,6 +131,9 @@ public class MerchantAppConfigServiceImpl extends ServiceImpl<MerchantAppConfigM
                 merchantAppConfig.setMerchantId(fsPayConfig.getHuifuId());
                 merchantAppConfig.setMerchantId(fsPayConfig.getHuifuId());
                 merchantAppConfig.setCallbackUrl(fsPayConfig.getHfPayNotifyUrl());
                 merchantAppConfig.setCallbackUrl(fsPayConfig.getHfPayNotifyUrl());
                 break;
                 break;
+            case "appPay": // app官方支付
+                merchantAppConfig.setMerchantId(fsPayConfig.getAliAppId() + "&" + fsPayConfig.getWxAppMchId());
+                break;
             default:
             default:
                 throw new RuntimeException("商户类型错误");
                 throw new RuntimeException("商户类型错误");
         }
         }
@@ -166,6 +169,9 @@ public class MerchantAppConfigServiceImpl extends ServiceImpl<MerchantAppConfigM
                 merchantAppConfig.setMerchantId(fsPayConfig.getHuifuId());
                 merchantAppConfig.setMerchantId(fsPayConfig.getHuifuId());
                 merchantAppConfig.setCallbackUrl(fsPayConfig.getHfPayNotifyUrl());
                 merchantAppConfig.setCallbackUrl(fsPayConfig.getHfPayNotifyUrl());
                 break;
                 break;
+            case "appPay": // app官方支付
+                merchantAppConfig.setMerchantId(fsPayConfig.getAliAppId() + "&" + fsPayConfig.getWxAppMchId());
+                break;
             default:
             default:
                 throw new RuntimeException("商户类型错误");
                 throw new RuntimeException("商户类型错误");
         }
         }