From 98392b21b84dec722bbb557e3de1636ed1535cec Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Sat, 12 Oct 2019 15:38:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=B7=BB=E5=8A=A0=E4=B8=8B?= =?UTF-8?q?=E7=BA=A7=E6=B8=B8=E6=88=8Fbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/ApplyController.class.php | 112 +++++++++++------- 1 file changed, 66 insertions(+), 46 deletions(-) diff --git a/Application/Home/Controller/ApplyController.class.php b/Application/Home/Controller/ApplyController.class.php index f70bea6b4..939b29d69 100644 --- a/Application/Home/Controller/ApplyController.class.php +++ b/Application/Home/Controller/ApplyController.class.php @@ -196,8 +196,8 @@ class ApplyController extends BaseController $this->meta_title = "申请游戏"; $this->display('index'); } - - //查看游戏资料专区 + + //查看游戏资料专区 public function feature($p = 0, $type = 0) { $promoteId = empty(I('promote_id')) ? PID : I('promote_id');//搜索的渠道ID @@ -214,21 +214,21 @@ class ApplyController extends BaseController $map['tab_game.down_port'] = 1;//游戏端口 第三方接口不能申请 $map['tab_game.game_status'] = 1;//游戏状态 $map['tab_game.developers'] = 0; //平台游戏(官网游戏，非开发者游戏) - - $applyPromote = M('apply','tab_')->field('game_id')->where(['promote_id' => $promoteId])->select(); - $noDeveloperGameArr = array(); - - foreach ($applyPromote as $key => $value) { - $applyPromoteGameId = $value['game_id']; - $gameInfo = M('Game','tab_') - ->field('id,icon,game_name,features,sdk_version,game_size,game_type_name,relation_game_name,developers') - ->where(['id' => $applyPromoteGameId])->select(); - if($gameInfo[0]['developers'] > 0){ - unset($gameInfo[0]['developers']); - $noDeveloperGameArr[] = $gameInfo[0]['id'] ; //非开发者游戏 - } - } - + + $applyPromote = M('apply', 'tab_')->field('game_id')->where(['promote_id' => $promoteId])->select(); + $noDeveloperGameArr = array(); + + foreach ($applyPromote as $key => $value) { + $applyPromoteGameId = $value['game_id']; + $gameInfo = M('Game', 'tab_') + ->field('id,icon,game_name,features,sdk_version,game_size,game_type_name,relation_game_name,developers') + ->where(['id' => $applyPromoteGameId])->select(); + if ($gameInfo[0]['developers'] > 0) { + unset($gameInfo[0]['developers']); + $noDeveloperGameArr[] = $gameInfo[0]['id']; //非开发者游戏 + } + } + $page = intval($p); $page = $page ? $page : 1; //默认显示第一页数据 @@ -244,14 +244,14 @@ class ApplyController extends BaseController $map['tab_game.relation_game_name'] = ['like', $thisRelationGameName]; $where['_complex'] = $map; - // $where['tab_game.id'] = ['in',$noDeveloperGameArr]; - // $where['_logic']='or'; - }else { + // $where['tab_game.id'] = ['in',$noDeveloperGameArr]; + // $where['_logic']='or'; + } else { $where['_complex'] = $map; - $where['tab_game.id'] = ['in',$noDeveloperGameArr]; - $where['_logic']='or'; + $where['tab_game.id'] = ['in', $noDeveloperGameArr]; + $where['_logic'] = 'or'; } - + $data = M('Game', 'tab_') ->field('tab_game.id,tab_game.icon,tab_game.game_name,tab_game.features,tab_game.sdk_version,tab_game.game_size,tab_game.game_type_name,tab_game.relation_game_name,ta_1.id as apply_id_1') ->join('left join tab_apply as ta_1 on tab_game.id = ta_1.game_id and ta_1.offline_status = 0 and ta_1.promote_id = ' . $promoteId)//查询是否拥有该游戏 @@ -260,7 +260,7 @@ class ApplyController extends BaseController ->page($page, $row) ->select(); //$AllData = array_merge($noDeveloperGameArr,$data); - + /* 查询记录总数 */ $count = M("Game", "tab_") ->field('tab_game.id') @@ -283,13 +283,13 @@ class ApplyController extends BaseController $this->assign('list_data', $data); $this->assign("count", $count); $this->assign("promoteId", $promoteId); - // $this->assign('parentPromoteId', $parentPromoteId); + // $this->assign('parentPromoteId', $parentPromoteId); $this->assign('thisParentPromoteId', $thisParentPromoteId); - // $this->assign('promoteRole', $promoteRole); + // $this->assign('promoteRole', $promoteRole); $this->assign('pID', PID); //$this->assign('promoteData', getAllPromoteListByType($promoteRole)); // $this->assign('addPermission', $addPermission); - // $this->assign('type', $type); + // $this->assign('type', $type); $this->meta_title = "申请游戏"; @@ -1622,7 +1622,7 @@ class ApplyController extends BaseController $newPromoteData = []; if (count($promoteIds) > 0) { foreach ($promoteIds as $value) { - $thisPromote = M('apply', 'tab_')->where(array('game_id' => $gameId, 'promote_id' => $value['id']))->count('id'); + $thisPromote = M('apply', 'tab_')->where(array('game_id' => $gameId, 'promote_id' => $value['id'], 'offline_status' => 0))->count('id'); if (!$thisPromote) { $newPromoteData[] = $value; @@ -1667,15 +1667,24 @@ class ApplyController extends BaseController $this->ajaxReturn($data); } - $save['game_id'] = $gameId; - $save['game_name'] = get_game_name($gameId); - $save['promote_id'] = $value; - $save['promote_account'] = session("promote_auth.account"); + $map['game_id'] = $gameId; + $map['promote_id'] = $value; + $applyData = M('apply', 'tab_')->field('id,offline_status')->where($map)->find(); + + $updateStatus = 0; + if (!empty($applyData)) { + if ($applyData['offline_status'] == 0) { + continue; + } else { + $updateStatus = 1; + } + } + + $save['promote_account'] = $thisPromoteData['account']; $save['apply_time'] = NOW_TIME; - $save['status'] = C('SET_AUTO_PACK'); - $save['sdk_version'] = $gameData['sdk_version']; $save['ratio'] = $gameData['ratio']; $save['money'] = $gameData['money']; + $save['offline_status'] = 0; $gameSource = M('Game_source', 'tab_')->field('id,source_version')->where(['game_id' => $gameId])->find(); if (!file_exists(get_game_source_file_url($gameId)) || null == $gameSource) { @@ -1684,7 +1693,17 @@ class ApplyController extends BaseController $save['enable_status'] = 2; } - $res = M('Apply', 'tab_')->add($save); + if ($updateStatus == 0) { + $save['sdk_version'] = $gameData['sdk_version']; + $save['game_id'] = $gameId; + $save['game_name'] = get_game_name($gameId); + $save['promote_id'] = $value; + $save['status'] = C('SET_AUTO_PACK'); + + $res = M('Apply', 'tab_')->add($save); + } else { + $res = M('Apply', 'tab_')->where('id = ' . $applyData['id'])->save($save); + } if (!$res) { $this->ajaxReturn(array("status" => -1, "msg" => "添加失败", 'ret' => $res)); @@ -1707,25 +1726,26 @@ class ApplyController extends BaseController $this->ajaxReturn(['status' => 1, 'data' => $enableStatus]); } - - public function backDetailData() { //返回详情数据 - $result = ['code' => 10001,'msg' => "该游戏信息不存在，请确认！",'error' => 1,'info' => '']; + + public function backDetailData() + { //返回详情数据 + $result = ['code' => 10001, 'msg' => "该游戏信息不存在，请确认！", 'error' => 1, 'info' => '']; $id = $_POST['id']; - if(empty($id)) { + if (empty($id)) { $this->ajaxReturn($result); } - $gameInfo = M('Game','tab_')->where(['id' => $id])->getField('detail_content'); - if(!$gameInfo) { - $this->ajaxReturn($result); - }else { + $gameInfo = M('Game', 'tab_')->where(['id' => $id])->getField('detail_content'); + if (!$gameInfo) { + $this->ajaxReturn($result); + } else { $result['code'] = 10000; $result['msg'] = "获取信息成功"; $result['error'] = -1; $result['info'] = $gameInfo; $this->ajaxReturn($result); - + } - - + + } }