pay_rule

Application/Common/Common/extend.php

@@ -2046,7 +2046,9 @@ function get_payment_config($way=1, $game=0, $user_id=0) {
                 $merchant_id = $rule['weixin_merchant_id'];
             if ($way == 4)
                 $merchant_id = $rule['express_merchant_id'];
-                    
+            if ($merchant_id == 0) {
+                return get_default_payment_config($way);
+            }
             $pay_conf = M('payment_merchant', 'tab_')->where([
                 'id' => $merchant_id
             ])->find();
@@ -2149,6 +2151,9 @@ function get_payment_config($way=1, $game=0, $user_id=0) {
             if ($way == 4)
                 $merchant_id = $rule['express_merchant_id'];
             
+            if ($merchant_id == 0) {
+                return get_default_payment_config($way);
+            }
             $pay_conf = M('payment_merchant', 'tab_')->where([
                 'id' => $merchant_id
             ])->find();