From 0acc14d95c665584dd8774bd33b76fead03b586b Mon Sep 17 00:00:00 2001
From: tping <tpingzhang11@126.com>
Date: Wed, 29 Jul 2020 19:02:07 +0800
Subject: [PATCH] pay_rule

---
 Application/Common/Common/extend.php | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/Application/Common/Common/extend.php b/Application/Common/Common/extend.php
index aa1b16eb..85ad7fa7 100644
--- a/Application/Common/Common/extend.php
+++ b/Application/Common/Common/extend.php
@@ -2039,15 +2039,6 @@ function get_payment_config($way=1, $game=0, $user_id=0) {
             }
         }
         
-        if (!$find_rule) {
-            foreach ($payment_rule as $v) {
-                if ($v['game_type_id'] == 0 && $v['game_id'] == 0 && $v['company_id'] == 0 && $v['company_belong'] == $company['company_belong']) {
-                    $rule = $v;
-                    $find_rule = true;
-                    break;
-                }
-            }
-        }
         
         if ($find_rule) {
             $merchant_id = $rule['alipay_merchant_id'];
@@ -2116,7 +2107,7 @@ function get_payment_config($way=1, $game=0, $user_id=0) {
         if (!$find_rule) {
             foreach ($payment_rule as $v) {
                 
-                if ($v['company_id'] == 0 && $v['company_belong'] == $company['company_belong'] && $v['game_id'] == 0 && $game['game_type_id'] == 0) {
+                if ($v['company_id'] == 0 && $v['company_belong'] == $company['company_belong'] && $v['game_id'] == 0 && $v['game_type_id'] == 0) {
                     $rule = $v;
                     $find_rule = true;
                     //                     echo '5';
@@ -2128,7 +2119,7 @@ function get_payment_config($way=1, $game=0, $user_id=0) {
         // 5 游戏
         if (!$find_rule) {
             foreach ($payment_rule as $v) {
-                if ($v['company_id'] == 0 && $v['company_belong'] == -1 && $v['game_id'] == $baseGameId && $game['game_type_id'] == 0) {
+                if ($v['company_id'] == 0 && $v['company_belong'] == -1 && $v['game_id'] == $baseGameId && $v['game_type_id'] == 0) {
                     $rule = $v;
                     $find_rule = true;
                     //                     echo '6';