fix:CommonPayParams 字段 merchantType 为public

config.gradle

@@ -39,7 +39,7 @@ ext {
             "ydl-webview"     : "0.0.38.33",
             "ydl-webview"     : "0.0.38.33",
             "ydl-media"       : "0.0.21.6",
-            "ydl-pay"         : "0.0.18.11",
+            "ydl-pay"         : "0.0.18.13",
             "m-audioim"       : "0.0.49.29.7",
             "ydl-flutter-base": "0.0.14.19",
 
@@ -120,7 +120,7 @@ ext {
             //第二步 若干
             "ydl-webview"     : "0.0.38.32",
             "ydl-media"       : "0.0.21.6",
-            "ydl-pay"         : "0.0.18.10",
+            "ydl-pay"         : "0.0.18.11",
             "m-audioim"       : "0.0.49.29.7",
             "ydl-flutter-base": "0.0.14.19",
 

ydl-pay/src/main/java/com/yidianling/ydl_pay/common/bean/params/AliPayParam.java

@@ -9,7 +9,7 @@ package com.yidianling.ydl_pay.common.bean.params;
  */
 public class AliPayParam extends CommonPayParam {
 
-    public AliPayParam(String payId,int isThreePay) {
-        super(payId, "aliapp",isThreePay);
+    public AliPayParam(String payId, int isThreePay) {
+        super(payId, "aliapp", isThreePay,"");
     }
 }

ydl-pay/src/main/java/com/yidianling/ydl_pay/common/bean/params/CommonPayParam.java

@@ -14,10 +14,11 @@ public class CommonPayParam extends BaseCommand {
     public String payId;
     public String type;
     public int isThreePay = 0;//混合支付  0   纯三方支付 isThreePay 1
-
-    public CommonPayParam(String payId, String type, int isThreePay) {
+    public String merchantType="";//增加微信支付参数，用于解决微信支付限额的问题
+    public CommonPayParam(String payId, String type, int isThreePay,String merchantType) {
         this.payId = payId;
         this.isThreePay = isThreePay;
         this.type = type;
+        this.merchantType=merchantType;
     }
 }

ydl-pay/src/main/java/com/yidianling/ydl_pay/common/bean/params/WxPayParam.java

@@ -13,9 +13,8 @@ import com.ydl.ydlcommon.base.config.YDLConstants;
  * @date 2019/4/24
  */
 public class WxPayParam extends CommonPayParam {
-    private String merchantType="";//增加微信支付参数，用于解决微信支付限额的问题
     public WxPayParam(String payId, int isThreePay,String merchantType) {
-        super(payId, "wxapp_hz", isThreePay);
+        super(payId, "wxapp_hz", isThreePay,merchantType);
         if(!TextUtils.isEmpty(BaseApp.instance.getGlobalConfig().getAppWxPayType())) {
             type =BaseApp.instance.getGlobalConfig().getAppWxPayType();
         }else {