公会分成管理--更新

Application/Admin/Controller/PromoteGameRatioController.class.php

@@ -70,8 +70,8 @@ class PromoteGameRatioController extends ThinkController
                 $thisLastRatioStatus = $promoteGameRatio['last_ratio_status'];
                 $thisStatusText = self::$statusList[$promoteGameRatio['status']];
                 $thisStatusText = ($promoteGameRatio['status'] == -1) ? '<span style="color: red;">' . $thisStatusText . '</span>' : $thisStatusText;
-                $thisApplicant = getPromoteAccount($promoteGameRatio['applicant_id']);
+                $thisApplicant = get_admin_account($promoteGameRatio['applicant_id']);
-                $thisReviewer = $promoteGameRatio['reviewer_id'] ? getPromoteAccount($promoteGameRatio['reviewer_id']) : '待确认';
+                $thisReviewer = $promoteGameRatio['reviewer_id'] ? get_admin_account($promoteGameRatio['reviewer_id']) : '待确认';
                 $thisBeninTime = date('Y/m/d', $promoteGameRatio['begin_time']);
                 $thisEndTime = $promoteGameRatio['end_time'] ? date('Y/m/d', $promoteGameRatio['end_time']) : '永久';
                 $validDate = $thisBeninTime . ' - ' . $thisEndTime;

Application/Admin/View/PromoteGameRatio/lists.html

@@ -180,7 +180,7 @@
                 <li class="promote-con-con " id="deny">
                     <div class="mb20">
                         <span class="promote-name">备注:</span>
-                        <textarea class="textarea-style ids" name="remark"></textarea>
+                        <textarea class="textarea-style" name="remark" id="remark"></textarea>
                     </div>
                     <a class="ajax-post pack" style="cursor: pointer;" target-form="ids" url="{:U('setStatus',array('status'=>-1))}"><div class="promote-btn">拒绝</div></a>
                 </li>
@@ -233,6 +233,7 @@ function refuse() {
             content: $('.promote-layer')
         });
         $('#deny').addClass('promote-show');
+        $('#remark').addClass('ids');
     } else {
         updateAlert('请选择需要操作的数据','tip_error');
         setTimeout(function(){

Application/Home/Controller/GameDivideController.class.php

@@ -24,23 +24,53 @@ class GameDivideController extends BaseController
         $modelList = ['游戏管理', $metaTitle];
         $this->verifyPasswordView($modelList);
 
-        $map['tab_game.online_status'] = 1;//开发者游戏上线状态
+        $time = time();
-        $map['tab_game.down_port'] = 1;//游戏端口 第三方接口不能申请
+        $promoteId = $loginPromote['id'];
-        $map['tab_game.game_status'] = 1;//游戏状态
+        if ($loginPromote['level'] != 1) {
+            $chain = explode('/', trim($loginPromote['chain'], '/'));
+            $promoteId = empty($chain[0]) ? 0 : intval($chain[0]);
+        }
+        $promoteGameRatiosMap['promote_id'] = $promoteId;
+        $promoteGameRatiosMap['status'] = 1;
+        $promoteGameRatiosMap['begin_time'] = ['elt', $time];
+        $promoteGameRatiosWhere['_string'] = "end_time = 0 or end_time >= $time";
+        $promoteGameRatiosMap['_complex'] = $promoteGameRatiosWhere;
+
+        $map['online_status'] = 1;//开发者游戏上线状态
+        $map['down_port'] = 1;//游戏端口 第三方接口不能申请
+        $map['game_status'] = 1;//游戏状态
         empty(I('relation_game_id')) || $map['relation_game_id'] = I('relation_game_id');
         empty(I('sdk_version')) || $map['sdk_version'] = I('sdk_version');
         empty(I('server_type')) || $map['server_type'] = I('server_type');
 
-        $minRatio = floatval(I('min_ratio', 0));
+        $minRatio = I('min_ratio', '');
-        $maxRatio = floatval(I('max_ratio', 0));
+        $maxRatio = I('max_ratio', '');
+        if (!empty($minRatio) || !empty($maxRatio)) {
+            $promoteGameRatiosNotInMap = $promoteGameRatiosMap;
             if (!empty($minRatio) && empty($maxRatio)) {
+                $promoteGameRatiosMap['ratio'] = ['egt', $minRatio];
                 $map['ratio'] = ['egt', $minRatio];
             } elseif (empty($minRatio) && !empty($maxRatio)) {
+                $promoteGameRatiosMap['ratio'] = ['elt', $maxRatio];
                 $map['ratio'] = ['elt', $maxRatio];
             } elseif (!empty($minRatio) && !empty($maxRatio)) {
+                $promoteGameRatiosMap['ratio'] = ['between', [$minRatio, $maxRatio]];
                 $map['ratio'] = ['between', [$minRatio, $maxRatio]];
             }
 
+            $promoteGameRatioIds = M('promote_game_ratio', 'tab_')->where($promoteGameRatiosMap)->getField('game_id', true);
+            $promoteGameRatioNotInIds = M('promote_game_ratio', 'tab_')->where($promoteGameRatiosNotInMap)->getField('game_id', true);
+            if (!empty($promoteGameRatioIds)) {
+                $whereOr['id'] = ['not in', $promoteGameRatioNotInIds];
+                $whereOr['ratio'] = $map['ratio'];
+                $where['id'] = ['in', $promoteGameRatioIds];
+                $where['_logic'] = 'or';
+                $where['_complex'] = $whereOr;
+                $map['_complex'] = $where;
+                unset($map['ratio']);
+            }
+        }
+
         $page = intval(I('get.p', 0));
         $page = $page ? $page : 1; //默认显示第一页数据
 
@@ -53,21 +83,28 @@ class GameDivideController extends BaseController
         $data = M('Game', 'tab_')
             ->field('id,icon,game_name,game_type_name,sdk_version,server_type,discount,ratio')
             ->where($map)
-            ->order('sort desc')
+            ->order('id desc')
             ->page($page, $row)
             ->select();
         $count = M('Game', 'tab_')
             ->where($map)
             ->count();
 
+        if (!empty($data)) {
+            $promoteGameRatios = M('promote_game_ratio', 'tab_')->where($promoteGameRatiosMap)->getField('game_id, ratio', true);
+            foreach ($data as &$list) {
+                $list['ratio'] = isset($promoteGameRatios[$list['id']]) ? $promoteGameRatios[$list['id']] : $list['ratio'];
+            }
+        }
+
         //分页
         $parameter['p'] = I('get.p', 1);
         $parameter['row'] = I('get.row');
         empty(I('relation_game_id')) || $parameter['relation_game_id'] = I('relation_game_id');
         empty(I('sdk_version')) || $parameter['sdk_version'] = I('sdk_version');
         empty(I('server_type')) || $parameter['server_type'] = I('server_type');
-        empty($minRatio) || $parameter['min_ratio'] = $minRatio;
+        ($minRatio === '') || $parameter['min_ratio'] = $minRatio;
-        empty($maxRatio) || $parameter['max_ratio'] = $maxRatio;
+        ($maxRatio === '') || $parameter['max_ratio'] = $maxRatio;
 
         $page = set_pagination($count, $row, $parameter);
         if ($page) {