Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev

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,10 +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']) {
-                    $promoteId = $promoteGameRatio['promote_id'];
-                    $this->isWithdraw($promoteId, $save['begin_time']);//是否存在开始时间后已提现数据
-
+                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']) {
                     if ($promoteGameRatio['status'] == 1) {
                         $save['last_turnover_ratio'] = $promoteGameRatio['turnover_ratio'];
                         $save['last_ratio'] = $promoteGameRatio['ratio'];
@@ -250,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) {