From 843c54ced526afd7a7dd2b57ea32e4a8fbfbfcc9 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Thu, 9 Jan 2020 17:03:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E6=8F=90=E7=8E=B0--?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/PromoteGameRatioController.class.php    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/Controller/PromoteGameRatioController.class.php b/Application/Admin/Controller/PromoteGameRatioController.class.php
index 6b5793357..63d8a2aa0 100644
--- a/Application/Admin/Controller/PromoteGameRatioController.class.php
+++ b/Application/Admin/Controller/PromoteGameRatioController.class.php
@@ -175,7 +175,7 @@ class PromoteGameRatioController extends ThinkController
             if (!isset($params['ratio']) || $params['ratio'] === '') {
                 $this->error('默认分成比例不能为空');
             }
-            $save['turnover_ratio'] = '';
+            $save['turnover_ratio'] = [];
             if (!empty(array_filter($params['turnover'])) || !empty(array_filter($params['turnover_ratio']))) {
                 if (is_array($params['turnover']) && is_array($params['turnover_ratio'])) {
                     foreach ($params['turnover'] as $turnover) {
@@ -205,7 +205,6 @@ class PromoteGameRatioController extends ThinkController
                         $this->error('月流水分成比例必须以正序的方式填写，且必须大于上一个月流水分成比例');
                     }
 
-                    $save['turnover_ratio'] = [];
                     foreach ($params['turnover'] as $key => $turnover) {
                         $save['turnover_ratio'][] = [
                             'turnover' => bcdiv($turnover, 1, 2),
@@ -227,7 +226,7 @@ class PromoteGameRatioController extends ThinkController
                 if (empty($promoteGameRatio)) {
                     $this->error('参数异常');
                 }
-                if ($promoteGameRatio['status'] == -1 || $save['begin_time'] != $promoteGameRatio['begin_time'] || $save['end_time'] != $promoteGameRatio['end_time'] || $save['ratio'] != $promoteGameRatio['ratio'] || $save['remark'] != $promoteGameRatio['remark']) {
+                if ($promoteGameRatio['status'] == -1 || $save['begin_time'] != $promoteGameRatio['begin_time'] || $save['end_time'] != $promoteGameRatio['end_time'] || $save['ratio'] != $promoteGameRatio['ratio'] || $save['remark'] != $promoteGameRatio['remark'] || $save['turnover_ratio'] != $promoteGameRatio['turnover_ratio']) {
                     $promoteId = $promoteGameRatio['promote_id'];
                     $this->isWithdraw($promoteId, $save['begin_time']);//是否存在开始时间后已提现数据
 

From 9b471084000769c5d9da146df7517ff91945a6b2 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Thu, 9 Jan 2020 17:09:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E6=8F=90=E7=8E=B0--?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/PromoteGameRatioController.class.php     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Application/Admin/Controller/PromoteGameRatioController.class.php b/Application/Admin/Controller/PromoteGameRatioController.class.php
index 63d8a2aa0..15b883f5d 100644
--- a/Application/Admin/Controller/PromoteGameRatioController.class.php
+++ b/Application/Admin/Controller/PromoteGameRatioController.class.php
@@ -227,9 +227,6 @@ class PromoteGameRatioController extends ThinkController
                     $this->error('参数异常');
                 }
                 if ($promoteGameRatio['status'] == -1 || $save['begin_time'] != $promoteGameRatio['begin_time'] || $save['end_time'] != $promoteGameRatio['end_time'] || $save['ratio'] != $promoteGameRatio['ratio'] || $save['remark'] != $promoteGameRatio['remark'] || $save['turnover_ratio'] != $promoteGameRatio['turnover_ratio']) {
-                    $promoteId = $promoteGameRatio['promote_id'];
-                    $this->isWithdraw($promoteId, $save['begin_time']);//是否存在开始时间后已提现数据
-
                     if ($promoteGameRatio['status'] == 1) {
                         $save['last_turnover_ratio'] = $promoteGameRatio['turnover_ratio'];
                         $save['last_ratio'] = $promoteGameRatio['ratio'];
@@ -249,7 +246,6 @@ class PromoteGameRatioController extends ThinkController
                 }
                 $promoteId = intval($params['promote_id']);
                 $gameId = intval($params['game_id']);
-                $this->isWithdraw($promoteId, $save['begin_time']);//是否存在开始时间后已提现数据
 
                 $promote = M('promote', 'tab_')->find($promoteId);
                 if (empty($promote) || $promote['level'] != 1) {