From 6a506540455204f2d40e488853c9b6f215b87df1 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 18 Nov 2020 15:44:48 +0800 Subject: [PATCH 01/39] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=BB=9F=E8=AE=A1/?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=99=BB=E5=BD=95=E6=97=B6=E9=97=B4=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ExportController.class.php | 51 ++++++++++++++----- .../Controller/FinanceController.class.php | 47 ++++++++++++----- .../Controller/KuaijieController.class.php | 3 +- Application/Admin/Model/MemberModel.class.php | 2 +- .../Admin/View/Finance/gameStatistics.html | 24 ++++++--- Application/Common/Common/function.php | 3 +- Application/Common/Conf/config.php | 2 +- 7 files changed, 98 insertions(+), 34 deletions(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 3247934db..4ef21467d 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -8362,9 +8362,11 @@ class ExportController extends Controller array('inside_cash_count','内充支出'), array('all_cash_count','游戏内充值合计'), array('notice_fail_count','联运通知失败合计'), - array('agg_amount','聚合平台数据'), + array('agg_wm_amount','聚合万盟数据'), + array('agg_wm_failed_amount','聚合万盟通知失败'), array('test_amount','聚合平台测试订单'), - array('agg_failed_amount','聚合通知失败合计'), + array('agg_amount','聚合其他渠道数据'), + array('agg_failed_amount','聚合其他渠道通知失败订单'), ); $map = []; @@ -8451,33 +8453,56 @@ class ExportController extends Controller ]); $aggData = []; + $aggWmData = []; $aggFailData = []; + $aggWmFailData = []; $aggTotal = '0.00'; + $aggWmTotal = '0.00'; $aggFailTotal = '0.00'; + $aggWmFailTotal = '0.00'; if ($result['code'] == '0000') { - $aggData = $result['data']['records']; - $aggFailData = $result['data']['fail_records']; - $aggTotal = $result['data']['total']; - $aggFailTotal = $result['data']['fail_total']; + $aggData = $result['data']['records'] ?? []; + $aggWmData = $result['data']['wm_records'] ?? []; + $aggFailData = $result['data']['fail_records'] ?? []; + $aggWmFailData = $result['data']['wm_fail_records'] ?? []; + $aggTotal = $result['data']['total'] ?? '0.00'; + $aggWmTotal = $result['data']['wm_total'] ?? '0.00'; + $aggFailTotal = $result['data']['fail_total'] ?? '0.00'; + $aggWmFailTotal = $result['data']['wm_fail_total'] ?? '0.00'; } $exceptIds = getAggExceptIds($gameSets); foreach ($xlsData as $key => $value) { $aggAmount = '0.00'; + $aggWmAmount = '0.00'; $aggFailAmount = '0.00'; + $aggWmFailAmount = '0.00'; $testAmount = '0.00'; $deviceType = $value['sdk_version'] == 1 ? 'android' : 'ios'; - if ($value['unique_code'] && isset($aggData[$value['unique_code']]) && isset($aggData[$value['unique_code']][$deviceType])) { - $aggAmount = number_format($aggData[$value['unique_code']][$deviceType], 2, '.', ''); - $aggFailAmount = number_format($aggFailData[$value['unique_code']][$deviceType], 2, '.', ''); + if ($value['unique_code']) { + if (isset($aggData[$value['unique_code']]) && isset($aggData[$value['unique_code']][$deviceType])) { + $aggAmount = number_format($aggData[$value['unique_code']][$deviceType], 2, '.', ''); + } + if (isset($aggWmData[$value['unique_code']]) && isset($aggWmData[$value['unique_code']][$deviceType])) { + $aggWmAmount = number_format($aggWmData[$value['unique_code']][$deviceType], 2, '.', ''); + } + if (isset($aggFailData[$value['unique_code']]) && isset($aggFailData[$value['unique_code']][$deviceType])) { + $aggFailAmount = number_format($aggFailData[$value['unique_code']][$deviceType], 2, '.', ''); + } + if (isset($aggWmFailData[$value['unique_code']]) && isset($aggWmFailData[$value['unique_code']][$deviceType])) { + $aggWmFailAmount = number_format($aggWmFailData[$value['unique_code']][$deviceType], 2, '.', ''); + } + } $xlsData[$key]['agg_amount'] = $aggAmount; + $xlsData[$key]['agg_wm_amount'] = $aggWmAmount; $xlsData[$key]['agg_failed_amount'] = $aggFailAmount; + $xlsData[$key]['agg_wm_failed_amount'] = $aggWmFailAmount; if (isset($gameSets[$value['game_id']]) && isAggGame($gameSets[$value['game_id']]['pay_notify_url'])) { $xlsData[$key]['cash_count'] = $value['cash_count'] = 0; - $xlsData[$key]['balance_coin_count'] =$value['balance_coin_count'] = 0; - $xlsData[$key]['inside_cash_count'] =$value['inside_cash_count'] = 0; + $xlsData[$key]['balance_coin_count'] = $value['balance_coin_count'] = 0; + $xlsData[$key]['inside_cash_count'] = $value['inside_cash_count'] = 0; $testAmount = $testList[$value['game_id']] ?? '0.00'; } @@ -8518,8 +8543,10 @@ class ExportController extends Controller 'inside_cash_count'=>$sumInside, 'all_cash_count'=>$sumAll, 'notice_fail_count'=>$sumNoticeFail, - 'agg_amount' => $aggTotal, + 'agg_wm_amount' => $aggWmTotal, + 'agg_wm_failed_amount' => $aggWmFailTotal, 'test_amount' => round(floatval($testAllAmount), 2), + 'agg_amount' => $aggTotal, 'agg_failed_amount' => $aggFailTotal, ] ]; diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 6245f8322..89d9016a0 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -788,26 +788,46 @@ class FinanceController extends ThinkController 'device_type' => I("sdk_type", 0), ]); $aggData = []; + $aggWmData = []; $aggFailData = []; + $aggWmFailData = []; $aggTotal = '0.00'; + $aggWmTotal = '0.00'; $aggFailTotal = '0.00'; + $aggWmFailTotal = '0.00'; if ($result['code'] == '0000') { - $aggData = $result['data']['records']; - $aggFailData = $result['data']['fail_records']; - $aggTotal = $result['data']['total']; - $aggFailTotal = $result['data']['fail_total']; + $aggData = $result['data']['records'] ?? []; + $aggWmData = $result['data']['wm_records'] ?? []; + $aggFailData = $result['data']['fail_records'] ?? []; + $aggWmFailData = $result['data']['wm_fail_records'] ?? []; + $aggTotal = $result['data']['total'] ?? '0.00'; + $aggWmTotal = $result['data']['wm_total'] ?? '0.00'; + $aggFailTotal = $result['data']['fail_total'] ?? '0.00'; + $aggWmFailTotal = $result['data']['wm_fail_total'] ?? '0.00'; } $endTime = time(); $exceptIds = getAggExceptIds($gameSets); foreach ($data as $key => $value) { $aggAmount = '0.00'; + $aggWmAmount = '0.00'; $aggFailAmount = '0.00'; + $aggWmFailAmount = '0.00'; $testAmount = '0.00'; $deviceType = $value['sdk_version'] == 1 ? 'android' : 'ios'; - if ($value['unique_code'] && isset($aggData[$value['unique_code']]) && isset($aggData[$value['unique_code']][$deviceType])) { - $aggAmount = number_format($aggData[$value['unique_code']][$deviceType], 2, '.', ''); - $aggFailAmount = number_format($aggFailData[$value['unique_code']][$deviceType], 2, '.', ''); + if ($value['unique_code']) { + if (isset($aggData[$value['unique_code']]) && isset($aggData[$value['unique_code']][$deviceType])) { + $aggAmount = number_format($aggData[$value['unique_code']][$deviceType], 2, '.', ''); + } + if (isset($aggWmData[$value['unique_code']]) && isset($aggWmData[$value['unique_code']][$deviceType])) { + $aggWmAmount = number_format($aggWmData[$value['unique_code']][$deviceType], 2, '.', ''); + } + if (isset($aggFailData[$value['unique_code']]) && isset($aggFailData[$value['unique_code']][$deviceType])) { + $aggFailAmount = number_format($aggFailData[$value['unique_code']][$deviceType], 2, '.', ''); + } + if (isset($aggWmFailData[$value['unique_code']]) && isset($aggWmFailData[$value['unique_code']][$deviceType])) { + $aggWmFailAmount = number_format($aggWmFailData[$value['unique_code']][$deviceType], 2, '.', ''); + } } if (isset($gameSets[$value['game_id']]) && isAggGame($gameSets[$value['game_id']]['pay_notify_url'])) { $data[$key]['cash_count'] = $value['cash_count'] = 0; @@ -816,8 +836,10 @@ class FinanceController extends ThinkController $testAmount = $testList[$value['game_id']] ?? '0.00'; } $data[$key]['all_cash_count'] = number_format($value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'],2,'.',''); - $data[$key]['agg_amount'] = $value['unique_code'] ? $aggAmount : '0.00'; - $data[$key]['agg_failed_amount'] = $value['unique_code'] ? $aggFailAmount : '0.00'; + $data[$key]['agg_amount'] = $aggAmount; + $data[$key]['agg_wm_amount'] = $aggWmAmount; + $data[$key]['agg_failed_amount'] = $aggFailAmount; + $data[$key]['agg_wm_failed_amount'] = $aggWmFailAmount; $data[$key]['test_amount'] = $testAmount; } @@ -852,13 +874,14 @@ class FinanceController extends ThinkController $game_types = M("game_type", 'tab_')->field('id, type_name')->select(); - $aggRate = round($aggTotal/($sumAll + $aggTotal) * 100, 2) . '%'; - $allRate = round($sumAll/($sumAll + $aggTotal) * 100, 2) . '%'; - + $aggRate = round(($aggTotal + $aggWmTotal)/($sumAll + $aggTotal + $aggWmTotal) * 100, 2) . '%'; + $allRate = round($sumAll/($sumAll + $aggTotal + $aggWmTotal) * 100, 2) . '%'; $this->assign('testAllAmount', $testAllAmount); $this->assign('aggFailTotal', $aggFailTotal); + $this->assign('aggWmFailTotal', $aggWmFailTotal); $this->assign('aggRate', $aggRate); $this->assign('allRate', $allRate); + $this->assign('aggWmTotal', $aggWmTotal); $this->assign('aggTotal', $aggTotal); $this->assign('game_types', $game_types); $this->assign('sumCash', $sumCash); diff --git a/Application/Admin/Controller/KuaijieController.class.php b/Application/Admin/Controller/KuaijieController.class.php index 4e861d1a5..5dddfc87a 100644 --- a/Application/Admin/Controller/KuaijieController.class.php +++ b/Application/Admin/Controller/KuaijieController.class.php @@ -20,7 +20,8 @@ class KuaijieController extends AdminController { * 频道列表 * @author 麦当苗儿 */ - public function index($p=0){ + public function index($p=0) + { $page = intval($p); $page = $page ? $page : 1; //默认显示第一页数据 diff --git a/Application/Admin/Model/MemberModel.class.php b/Application/Admin/Model/MemberModel.class.php index 52d3e1591..35bef2aa3 100644 --- a/Application/Admin/Model/MemberModel.class.php +++ b/Application/Admin/Model/MemberModel.class.php @@ -88,7 +88,7 @@ class MemberModel extends Model { //登录有效时间改为1小时 $expireTime = 3600; ini_set('session.gc_maxlifetime', $expireTime); - ini_set('session.cookie_lifetime', $expireTime); + ini_set('session.cookie_lifetime', 0); session('user_group_id',$groupId); session('user_auth', $auth); session('user_auth_sign', data_auth_sign($auth)); diff --git a/Application/Admin/View/Finance/gameStatistics.html b/Application/Admin/View/Finance/gameStatistics.html index 52697204c..e4eafb1eb 100644 --- a/Application/Admin/View/Finance/gameStatistics.html +++ b/Application/Admin/View/Finance/gameStatistics.html @@ -176,10 +176,11 @@
游戏内充值合计游戏现金金额+平台币直充支出+平台币内充支出
联运通知失败合计联运所有通知失败的合计金额
-
聚合平台数据包含聚合万盟平台数据，因为聚合平台数据是用接口获取并且涉及其他平台数据，所以只能添加总数据，无法判定平台币还是现金充值
+
聚合万盟数据聚合平台万盟渠道支付成功且通知成功的金额
+
聚合万盟通知失败聚合平台万盟渠道通知失败的订单合计金额
聚合平台测试订单聚合平台测试订单
-
聚合通知失败合计聚合所有通知失败的合计金额
- +
聚合其他渠道数据聚合平台其他渠道（不含万盟）支付成功通知成功订单合计
+
聚合其他渠道通知失败订单聚合平台其他渠道（不含万盟）
通知失败的订单合计金额
操作 @@ -232,7 +233,8 @@ 'game_id'=>$data['game_id'], 'game_name'=>$data['game_name'], 'partner_id'=>$_REQUEST['partner_id'] - ])}">{$data.agg_amount} + ])}">{$data.agg_wm_amount} + {$data.agg_failed_amount}0 {$data.test_amount} + {$data.agg_amount} {$data.agg_failed_amount}0 {$sumInside}0 {$sumAll}0 {$sumNoticeFail}0 - {$aggTotal} + {$aggWmTotal} + {$aggWmFailTotal}0 {$testAllAmount}0 + {$aggTotal} {$aggFailTotal}0 联运渠道数据：{$sumAll} 占比：{$allRate} 聚合渠道数据：{$aggTotal} 占比：{$aggRate}

+

联运渠道数据：{$sumAll} 占比：{$allRate} 聚合渠道数据：{$aggTotal + $aggWmTotal} 占比：{$aggRate}

diff --git a/Application/Common/Common/function.php b/Application/Common/Common/function.php index 7e21fa50b..04b978be9 100644 --- a/Application/Common/Common/function.php +++ b/Application/Common/Common/function.php @@ -35,7 +35,8 @@ function is_login() session('user_group_id', null); return 0; } else { - session('user_auth_expire', time() + $expire); + $expiredTime = time() + $expire; + session('user_auth_expire', $expiredTime); } return session('user_auth_sign') == data_auth_sign($user) ? $user['uid'] : 0; } diff --git a/Application/Common/Conf/config.php b/Application/Common/Conf/config.php index 02bc95be5..90383c743 100644 --- a/Application/Common/Conf/config.php +++ b/Application/Common/Conf/config.php @@ -90,7 +90,7 @@ $config = array( // session 配置数组 支持type name id path expire domain 等参数 'SESSION_OPTIONS' => array( - 'expire' => 7200 + // 'expire' => 3600 ), ); $config = array_merge($config, $env); From c75d73c9f7d167105739099d5df178559f6e80ef Mon Sep 17 00:00:00 2001 From: tping Date: Wed, 18 Nov 2020 17:29:28 +0800 Subject: [PATCH 02/39] 1126 --- .../Admin/Controller/GameController.class.php | 8 ++ .../Controller/PartnerController.class.php | 8 ++ .../PromoteCompanyController.class.php | 50 +++++++ Application/Admin/View/Partner/add.html | 129 +++++++++++++++-- .../Admin/View/PromoteCompany/add.html | 130 ++++++++++++++++-- .../Admin/View/PromoteCompany/lists.html | 105 +++++++++++++- 6 files changed, 412 insertions(+), 18 deletions(-) diff --git a/Application/Admin/Controller/GameController.class.php b/Application/Admin/Controller/GameController.class.php index 29c19144e..f27ca6064 100644 --- a/Application/Admin/Controller/GameController.class.php +++ b/Application/Admin/Controller/GameController.class.php @@ -362,6 +362,11 @@ class GameController extends ThinkController } } + /* + * ALTER TABLE `tab_game` +ADD COLUMN `kefu_qq_type` tinyint(2) NULL DEFAULT 0 COMMENT '客服qq类型：0跟随系统 1不显示 2其他' AFTER `select_package_name`, +ADD COLUMN `kefu_qq` varchar(255) NULL DEFAULT '' COMMENT 'kefu_qq_type为2 时有效' AFTER `kefu_qq_type`; + */ public function edit($id = null) { if (IS_POST) { @@ -459,6 +464,9 @@ class GameController extends ThinkController $otherData['unique_code'] = $sibling['unique_code']; $otherData['flooring_page_video'] = $sibling['flooring_page_video']; $otherData['flooring_page_video_cover'] = $sibling['flooring_page_video_cover']; + $otherData['kefu_qq'] = I('post.kefu_qq'); + $otherData['kefu_qq_type'] = I('post.kefu_qq_type'); + M('Game', 'tab_')->data($otherData)->where(array('id' => $another['id']))->save(); //同时修改代充游戏折扣 $set_fidel['status'] = 1; diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php index b991aa261..201855aa2 100644 --- a/Application/Admin/Controller/PartnerController.class.php +++ b/Application/Admin/Controller/PartnerController.class.php @@ -433,6 +433,14 @@ class PartnerController extends ThinkController if ($has_check) { $this->error('已存在同名cp,请勿重复添加'); } + + $save['relation']['collaborate_way'] = $save['part_a_type']; + if ($save['part_a_type'] == 1) { + $save['relation']['self_company_id'] = $save['part_b']; + } + if ($save['part_a_type'] == 2) { + $save['relation']['self_company_id'] = $save['part_a']; + } $res =D("PartnerVerify")->add_db($save); if ($res) { diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php index 25e0b7c3f..7cab4bfa7 100644 --- a/Application/Admin/Controller/PromoteCompanyController.class.php +++ b/Application/Admin/Controller/PromoteCompanyController.class.php @@ -214,6 +214,9 @@ class PromoteCompanyController extends ThinkController if ($page) { $this->assign('_page', $page); } + + $games = M('game', 'tab_')->field('relation_game_id id,relation_game_name game_name,short')->where(['game_status'=>1,'down_port'=>1])->group("relation_game_id")->select(); + $this->assign('games', $games); //分配其他页面需要参数 $this->assign('promoteList', getPromoteByLevel(1)); $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Partner/lists'])->find()); @@ -224,6 +227,44 @@ class PromoteCompanyController extends ThinkController $this->display(); } + // 批量上下架 + public function displayOnShelves() { + if (IS_AJAX) { + $post = I("post."); + +// var_dump(time()); + $where = []; + if ($post['batch_company_type'] == 1) { + $where['company_belong'] = array('exp', " IN (1,2)"); + } else { + $where['company_belong'] = $post['batch_company_type']; + } + if ($post['batch_type'] == 1) { // 批量增加 + $where['_string'] = "concat(',', game_ids, ',') not like \"%,{$post['batch_game']},%\""; + $exp = "trim(BOTH ',' FROM concat(game_ids, ',', {$post['batch_game']}))"; + } + if ($post['batch_type'] == 2) { // 批量删除 + $where['_string'] = "concat(',', game_ids, ',') like \"%,{$post['batch_game']},%\""; + $exp = "trim(BOTH ',' FROM replace(concat(',', game_ids, ','), \",{$post['batch_game']},\", ','))"; + } + M('promote', 'tab_')->where($where)->save([ + 'game_ids' => ['exp', $exp] + ]); + + M('promote_company', 'tab_')->where($where)->save([ + 'game_ids' => ['exp', $exp] + ]); +// var_dump(M('promote', 'tab_')->_sql(),time());die; + + echo $this->ajaxReturn([ + 'code' => 1, + 'msg' => '成功', + 'data' => [] + ]); + + } + } + public function index() { $page = intval(I('get.p', 0)); @@ -438,6 +479,15 @@ class PromoteCompanyController extends ThinkController } $save['create_time'] = $time; $save['turnover_ratio'] = $this->setTurnoverRatio($save); + + $save['relation']['collaborate_way'] = $save['part_a_type']; + if ($save['part_a_type'] == 1) { + $save['relation']['self_company_id'] = $save['part_b']; + } + if ($save['part_a_type'] == 2) { + $save['relation']['self_company_id'] = $save['part_a']; + } + $result = D("PromoteCompanyVerify")->add_db($save); if ($result) { addOperationLog(['op_type'=>0,'key'=>$save['company_name'],'op_name'=>'新增推广公司','url'=>U('PromoteCompany/lists')]); diff --git a/Application/Admin/View/Partner/add.html b/Application/Admin/View/Partner/add.html index 27965dc66..7d45aaaef 100644 --- a/Application/Admin/View/Partner/add.html +++ b/Application/Admin/View/Partner/add.html @@ -20,8 +20,8 @@

{$meta_title}

@@ -36,7 +36,7 @@ *合同合作方名称： - + @@ -135,7 +135,8 @@
- + + + + + + + + + + + + + + + + + - - - - - - + + + + + - - + + From 9da9941c9f8eac142e172321e1376125bba495fc Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 26 Nov 2020 10:41:30 +0800 Subject: [PATCH 17/39] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/SpendController.class.php | 38 ++++++++++++- Application/Admin/View/Spend/lists.html | 56 +++++++++++++++++-- 2 files changed, 88 insertions(+), 6 deletions(-) diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php index fad764a01..35b2470b4 100644 --- a/Application/Admin/Controller/SpendController.class.php +++ b/Application/Admin/Controller/SpendController.class.php @@ -11,6 +11,11 @@ use User\Api\UserApi as UserApi; class SpendController extends ThinkController { const model_name = 'Spend'; + const IsCheckStr=[ + "1"=>"是", + "2"=>"否" + ]; + public $OpAuthList; public function lists() { @@ -24,6 +29,10 @@ class SpendController extends ThinkController unset($_REQUEST['timestart']); unset($_REQUEST['timeend']); + if (isset($_REQUEST['is_check'])) { + $map['is_check'] = (int)($_REQUEST['is_check']); + } + if (isset($_REQUEST['user_account'])) { $map['user_account'] = array('like', trim($_REQUEST['user_account'])); unset($_REQUEST['user_account']); @@ -142,13 +151,13 @@ class SpendController extends ThinkController $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Spend/lists', 'status' => 1])->find()); $data = D(self::model_name)->lists($_GET["p"], $map, $order); - + $adminUsernameList = getAdminUsernameList(array_column($data['data'], 'market_admin_id')); foreach ($data['data'] as $key=>&$value ) { ($value['promote_account']=='官方渠道')?($value['promote_account']=C('OFFICIEL_CHANNEL')):''; $value['market_admin_username'] = $adminUsernameList[$value['market_admin_id']] ?? '无'; + $value['is_check_str'] = self::IsCheckStr[$value['is_check']]; } - $this->assign('showMarketAdmin', session('user_auth')['show_market_admin']); $this->assign('showPromote', session('user_auth')['show_promote']); $this->assign('isMarketAdmin', $isMarketAdmin); @@ -159,8 +168,33 @@ class SpendController extends ThinkController $this->assign('_page', $data['page']); $show_data_power = (is_administrator()|| session('user_auth')['show_data']); $this->assign('show_data_power', $show_data_power); + + if(!IS_ROOT){ + $this->OpAuthList= getModuleControllerAuth(); + } + + $this->assign('menubtn',$this->menuAuth()); $this->display(); } + + protected function menuAuth() + { + $mentBtn = [ + "addStatement"=>"参与结算", + "removeStatement"=>"移出结算", + ]; + $resarr = []; + foreach ($mentBtn as $k => $v) { + if(IS_ROOT){ + $resarr[] = $v; + }else{ + if(in_array($k,$this->OpAuthList)){ + $resarr[] = $v; + } + } + } + return $resarr; + } /** * 充值补单功能 diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html index 47eec6745..eb6b45ff5 100644 --- a/Application/Admin/View/Spend/lists.html +++ b/Application/Admin/View/Spend/lists.html @@ -31,6 +31,34 @@ line-height: 1.5; padding:5px; } + .search_list{ + margin-bottom: 15px; + } + .butnbox {padding:10px 0 10px;} + .butnbox .butnlist {overflow:hidden;clear:both;} + .butnbox .butnlist .butn,.butnbox .butnlist .butn:hover {text-decoration:none;border:none;} + .butnbox .butnlist .butn {display:inline-block;width:120px;height:28px;line-height:28px;text-align:center;color:#FFF;background:#3C95C8;border-radius:3px;} + .butnbox .butnlist .butn.last {background:#009900;} + .butnbox .butnlist .butn~.butn {margin-left:20px;} + .data_list table tbody tr a.disabled,.data_list table tbody tr a.disabled:hover {color:#999;cursor:default;} + .layui-layer-title { + text-align: center; + height: 80px; + line-height: 80px; + font-weight: 600; + font-size: 18px; + } + .data_list table td{ + line-height: 2; + } + + .layui-layer-title { + text-align: center; + height: 42px; + line-height: 42px; + font-weight: 400; + font-size: 14px; + } @@ -158,6 +186,16 @@ + +
+ +
+
@@ -166,7 +204,13 @@
- + +
+
+ + {$vo} + +
@@ -177,6 +221,7 @@ + + - + + + - - + - + From eeb18218598873e8f1514e6e956b7eea52291d73 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 26 Nov 2020 17:16:17 +0800 Subject: [PATCH 20/39] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/SpendController.class.php | 41 ++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php index 35b2470b4..077ecf406 100644 --- a/Application/Admin/Controller/SpendController.class.php +++ b/Application/Admin/Controller/SpendController.class.php @@ -195,7 +195,46 @@ class SpendController extends ThinkController } return $resarr; } - + + public function addStatement() + { + if(!isset($_REQUEST['ids']) || !isset($_REQUEST['type'])) $this->error("参数错误"); + $ids = $_REQUEST['ids']; + + $dbres = D(self::model_name)->where("id in ({$ids}) and type = '1'")->select(); + if(empty($dbres)){ + $this->ajaxReturn(array( + 'status' => 1, + "info"=>"加入结算成功" + )); + } + $ids = array_column($dbres,"id"); + + foreach ($dbres as $key=>$value) { + if($value['withdraw_type'] !=3) { + $this->DBModel->where("id = {$value['id']} and verify_status = 0")->delete(); + } else { + $this->DBModel->where("id = {$value['id']} and verify_status != 2")->delete(); + } + + } + addOperationLog(['op_type'=>2,'key'=>$ids,"op_name"=>"删除结算单",'url'=>U('lists')]); + $this->ajaxReturn(array( + 'status' => 1, + "info"=>"删除成功" + )); + } + protected function editOrderIscheck($ids,$oldval,$newval){ + $dbres = D(self::model_name)->where("id in ({$ids}) and type = '{$oldval}'")->select(); + if(empty($dbres)) return false; + $changeIds = array_column($dbres,"id"); + //执行操作 + $res = D(self::model_name)->where("id in ({$changeIds}) and type = '{$oldval}'")->save(['is_check'=>$newval]); + if(empty($res)) return false; + + return array_column($dbres,"id"); + + } /** * 充值补单功能 */ From 73f8c1637949339ff5db2527c42bc3c57ca48bab Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 26 Nov 2020 17:32:13 +0800 Subject: [PATCH 21/39] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/FinanceController.class.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 6245f8322..0434f8e5c 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -1004,6 +1004,10 @@ class FinanceController extends ThinkController if (!empty(I("game_id"))) { $map['game_id'] = I("game_id"); } + if(empty(I("game_id")) && !empty(I("game_name"))){ + $map['game_name'] = array('like','%'.I("game_name").'%');; + } + if (!empty(I('user_account'))) { $map['user_account'] = array('like','%'.I("user_account").'%'); } @@ -1071,7 +1075,10 @@ class FinanceController extends ThinkController $totalMap['s.game_id'] = $map['game_id']; unset($totalMap['game_id']); } - + if ($map['game_name']) { + $totalMap['s.game_name'] = $map['game_name']; + unset($totalMap['game_name']); + } $totalData = D('spend')->totalGameStatistics($totalMap, false); $sumCash = $totalData['cash_count'] ?? 0; From 74d9d6ed181b64f9382a3fb6b27d703bae67e0d7 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 27 Nov 2020 10:24:48 +0800 Subject: [PATCH 22/39] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=85=E5=80=BC?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 7 +- .../Controller/SpendController.class.php | 64 ++++++++----------- Application/Admin/View/Spend/lists.html | 59 ++++++++++++++++- 3 files changed, 91 insertions(+), 39 deletions(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 60c63486b..f47a6c040 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -2556,14 +2556,14 @@ function getCompanyBlongOther($id = -1) * array( * op_type=>操作类型 0:新增，1:编辑 2:删除 3:下载, * op_name=>操作说明 例如:编辑,删除,锁定等, - * url=>需要跳转的url 添加去列表加唯一id，编辑直接去编辑页面，下载可以重新下载(新开页面), + * url=>U函数可以跳转 的操作地址, * key=>关键词:用户的账号，游戏的名词等, * menu=>非必须，菜单目录，不存在的话按控制器寻找。 * ) */ function addOperationLog($options) { - $checkarr = ['op_type','url','key']; + $checkarr = ['op_type','key']; foreach ($checkarr as $v) { if(!array_key_exists($v,$options)){ return false; @@ -2572,6 +2572,9 @@ function addOperationLog($options) if(!array_key_exists("op_name",$options)){ $options['op_name'] = ($options['op_type'] == 1 ? "编辑" : ($options['op_type'] == 2 ? "删除" :($options['op_type'] == 3 ? "导出" :"新增"))); } + if(!array_key_exists("url",$options)){ + $options['url'] = MODULE_NAME."/".CONTROLLER_NAME."/".ACTION_NAME; + } //获取ip $addarray = [ "op_ip"=>$_SERVER['REMOTE_ADDR'], diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php index 077ecf406..efec7a82b 100644 --- a/Application/Admin/Controller/SpendController.class.php +++ b/Application/Admin/Controller/SpendController.class.php @@ -198,50 +198,42 @@ class SpendController extends ThinkController public function addStatement() { - if(!isset($_REQUEST['ids']) || !isset($_REQUEST['type'])) $this->error("参数错误"); + if(!isset($_REQUEST['ids'])) $this->error("参数错误"); $ids = $_REQUEST['ids']; - - $dbres = D(self::model_name)->where("id in ({$ids}) and type = '1'")->select(); - if(empty($dbres)){ - $this->ajaxReturn(array( - 'status' => 1, - "info"=>"加入结算成功" - )); - } - $ids = array_column($dbres,"id"); - - foreach ($dbres as $key=>$value) { - if($value['withdraw_type'] !=3) { - $this->DBModel->where("id = {$value['id']} and verify_status = 0")->delete(); - } else { - $this->DBModel->where("id = {$value['id']} and verify_status != 2")->delete(); - } - - } - addOperationLog(['op_type'=>2,'key'=>$ids,"op_name"=>"删除结算单",'url'=>U('lists')]); + $this->editOrderIscheck($ids,2,1); + $this->ajaxReturn(array( + 'status' => 1, + "info"=>"操作成功" + )); + } + public function removeStatement() + { + if(!isset($_REQUEST['ids'])) $this->error("参数错误"); + $ids = $_REQUEST['ids']; + $this->editOrderIscheck($ids,1,2); $this->ajaxReturn(array( 'status' => 1, - "info"=>"删除成功" + "info"=>"操作成功" )); + } protected function editOrderIscheck($ids,$oldval,$newval){ - $dbres = D(self::model_name)->where("id in ({$ids}) and type = '{$oldval}'")->select(); + $dbres = D(self::model_name)->where("id in ({$ids}) and is_check = '{$oldval}'")->select(); if(empty($dbres)) return false; - $changeIds = array_column($dbres,"id"); + + $changeIds = implode(",",array_column($dbres,"id")); //执行操作 - $res = D(self::model_name)->where("id in ({$changeIds}) and type = '{$oldval}'")->save(['is_check'=>$newval]); + $res = D(self::model_name)->where("id in ({$changeIds}) and is_check = '{$oldval}'")->save(['is_check'=>$newval]); if(empty($res)) return false; - - return array_column($dbres,"id"); - + //日志 + if($newval == 1){ + $op_name = "加入结算"; + $key = "addStatement"; + }else{ + $op_name = "移出结算"; + $key = "removeStatement"; + } + addOperationLog(['op_type'=>1,'key'=>$key,"op_name"=>$op_name,"content"=>json_encode(["ids"=>$_REQUEST['ids'],"is_check"=>$newval])]); + return true; } - /** - * 充值补单功能 - */ - public function order_repair() { - if (IS_AJAX) { - - } - } - } diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html index eb6b45ff5..ee308c9b4 100644 --- a/Application/Admin/View/Spend/lists.html +++ b/Application/Admin/View/Spend/lists.html @@ -262,7 +262,7 @@ - +
*甲方公司类型: + + + *乙方公司类型: + + +
*甲方公司: + + + *乙方公司: + + +
*结算周期: @@ -190,10 +232,10 @@ 选择否将不能进行线上打款 @@ -212,7 +254,7 @@
结算生效期限: + - 结束时间不选默认永久 @@ -417,15 +459,84 @@ + + +
生效列表 @@ -434,7 +447,7 @@
{$vo.game_name} {:getSDKTypeName($vo['sdk_version'],true)}{$vo.role_num}{$vo.user_num}{$vo.new_user_num}|{$vo.new_device_num}{$vo.new_ip_num}{$vo.login_user_num} {$vo.spend_user_num}{$vo.spend_num} {$vo.spend_all_amount|default=0} {$vo.spend_cash|default=0} {$vo.spend_generic|default=0}
支付订单号 CP订单号 @@ -206,16 +251,18 @@ 充值方式 订单状态 游戏通知状态是否参与结算 操作
aOh! 暂时还没有内容!aOh! 暂时还没有内容!
{$data.pay_order_number} @@ -295,6 +342,7 @@ {:get_info_status($data['pay_game_status'],14)} {$data.is_check_str}
汇总 + 汇总 当页充值：{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))} From 47fcab323b7b5b0ae0bcf256a0232ccec9d86b09 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Thu, 26 Nov 2020 13:53:16 +0800 Subject: [PATCH 18/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Finance/gameStatistics.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/Finance/gameStatistics.html b/Application/Admin/View/Finance/gameStatistics.html index e4eafb1eb..74a8444b4 100644 --- a/Application/Admin/View/Finance/gameStatistics.html +++ b/Application/Admin/View/Finance/gameStatistics.html @@ -234,7 +234,7 @@ 'game_name'=>$data['game_name'], 'partner_id'=>$_REQUEST['partner_id'] ])}">{$data.agg_wm_amount}{$data.agg_failed_amount}0{$data.agg_wm_failed_amount}0 {$data.agg_wm_amount} {$data.agg_wm_failed_amount}0 @@ -250,6 +251,7 @@ 'sdk_type'=>$_GET['sdk_type'], 'game_id'=>$data['game_id'], 'game_name'=>$data['game_name'], + 'channel_type'=>2, 'partner_id'=>$_REQUEST['partner_id'] ])}">{$data.agg_amount} {$data.agg_failed_amount}0
{$data.pay_order_number} @@ -718,6 +718,63 @@ }); $("#game_name").change(); + $("#addStatement,#removeStatement").on("click",function(){ + var id = $(this).attr("id"); + if(id == "addStatement"){ + var opname = "参与结算"; + var opurl = "{:U('addStatement')}"; + var opst ="[不参与结算]"; + var status = [2]; + }else if(id=="removeStatement"){ + var opname = "移出结算"; + var opurl = "{:U('removeStatement')}"; + var opst ="[参与结算]"; + var status = [1]; + } + var flag = false; + var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { + const ischeck = $(elem).data("ischeck"); + if($.inArray(ischeck,status) > -1){ + return $(elem).val(); + } + }).get(); + if(text.length < 1){ + layer.msg("" + '无需要'+opname+'的操作,仅'+opst+'状态可以进行'+opname+""); + return; + } + text = text.join(","); + layer.confirm('【提示】'+opname+'操作后，相应的结算单需要进行重算后生效', { + btn: ['确认','取消'], + title:false + }, function(index){ + layer.close(index); + layer.load(2); + $.ajax({ + type: "POST", + url: opurl, + dataType: 'json', + async: true, + data: {ids:text}, + success:function(data){ + layer.closeAll('loading'); + if(data.status==1){ + layer.msg("" + data.info + ""); + setTimeout(function(){ + window.location.reload(); + },1500); + }else{ + layer.msg("" + data.info + ""); + return false; + } + } + }); + }); + + + + + }) + /** * 初始化select2单选，默认带搜索功能。 */ From 5644570c1e2e782769f386d42ea33e287882fc96 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 27 Nov 2020 14:49:00 +0800 Subject: [PATCH 23/39] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/PromoteCompanyController.class.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php index 908635d09..0d47f5553 100644 --- a/Application/Admin/Controller/PromoteCompanyController.class.php +++ b/Application/Admin/Controller/PromoteCompanyController.class.php @@ -289,14 +289,22 @@ class PromoteCompanyController extends ThinkController if ($batchType == 1) { // 批量增加 $where['_string'] = "concat(',', game_ids, ',') not like \"%,{$gameId},%\""; $exp = "trim(BOTH ',' FROM concat(game_ids, ',', {$gameId}))"; + $op_name = "批量上架"; } if ($batchType == 2) { // 批量删除 $where['_string'] = "concat(',', game_ids, ',') like \"%,{$gameId},%\""; $exp = "trim(BOTH ',' FROM replace(concat(',', game_ids, ','), \",{$gameId},\", ','))"; + $op_name = "批量下架"; } M('promote', 'tab_')->where($where)->save([ 'game_ids' => ['exp', $exp] ]); + //加入日志 + $companys = M('promote_company', 'tab_')->field("id")->where($where)->select(); + if(!empty($companys)){ + $company_ids = implode(",",array_column($companys,"id")); + addOperationLog(['op_type'=>1,'key'=>"","op_name"=>$op_name,"content"=>json_encode(["company_id"=>$company_ids,"batchCompanyType"=>$batchCompanyType,"game_id"=>$gameId,'batch_type'=>$batchType])]); + } M('promote_company', 'tab_')->where($where)->save([ 'game_ids' => ['exp', $exp] From 7e1d2fb879d4bb055a9f433b575c5c4865777593 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 27 Nov 2020 15:02:36 +0800 Subject: [PATCH 24/39] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index a30a8d1ed..6c877ad5e 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -2583,7 +2583,7 @@ function getCompanyBlongOther($id = -1) */ function addOperationLog($options) { - $checkarr = ['op_type','url','key']; + $checkarr = ['op_type','key']; foreach ($checkarr as $v) { if(!array_key_exists($v,$options)){ return false; @@ -2592,6 +2592,9 @@ function addOperationLog($options) if(!array_key_exists("op_name",$options)){ $options['op_name'] = ($options['op_type'] == 1 ? "编辑" : ($options['op_type'] == 2 ? "删除" :($options['op_type'] == 3 ? "导出" :"新增"))); } + if(!array_key_exists("url",$options)){ + $options['url'] = MODULE_NAME."/".CONTROLLER_NAME."/".ACTION_NAME; + } //获取ip $addarray = [ "op_ip"=>$_SERVER['REMOTE_ADDR'], From 2d0bba8de50c017696863160305ae92c83ac7054 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 27 Nov 2020 17:43:08 +0800 Subject: [PATCH 25/39] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E6=B8=B8=E6=88=8F=E6=93=8D=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PromoteCompanyController.class.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php index 25e0b7c3f..131eb3c59 100644 --- a/Application/Admin/Controller/PromoteCompanyController.class.php +++ b/Application/Admin/Controller/PromoteCompanyController.class.php @@ -1189,6 +1189,9 @@ class PromoteCompanyController extends ThinkController $is_change_game = false; $Promote = M("Promote", "tab_"); if($old_info['game_ids'] != $game_ids){ + //操作日志 + $this->addCompanyGameChangeLog($company_id,$old_info['game_ids'],$game_ids); + if($old_info['company_belong'] == 1 || $old_info['company_belong'] == 2){ //外团跟随公司 $new_game_ids = D("Game")->changeRelationGameidToGameid($game_ids,true); @@ -1228,6 +1231,20 @@ class PromoteCompanyController extends ThinkController } } } + protected function addCompanyGameChangeLog($company_id,$old_game_ids,$new_game_ids){ + $old_game_ids = explode(',',$old_game_ids); + $new_game_ids = explode(',',$new_game_ids); + $addGameid = array_diff($new_game_ids,$old_game_ids); + $removeGameid = array_diff($old_game_ids,$new_game_ids); + if(!empty($addGameid)){ + $gameid = implode(',',$addGameid); + addOperationLog(['op_type'=>1,'key'=>"addCompanyGame","op_name"=>"新增推广游戏","content"=>json_encode(["company_id"=>$company_id,"relation_game_id"=>$gameid])]); + } + if(!empty($removeGameid)){ + $gameid = implode(',',$removeGameid); + addOperationLog(['op_type'=>1,'key'=>"removeCompanyGame","op_name"=>"移除推广游戏","content"=>json_encode(["company_id"=>$company_id,"relation_game_id"=>$gameid])]); + } + } /** * 由于修改公司信息引起的会长信息修改 * @param [type] $save From 9ddfb6f79418c67e4fa3e583484a974450c54028 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 27 Nov 2020 18:38:06 +0800 Subject: [PATCH 26/39] =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E5=8F=82=E4=B8=8E?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/FinancePromoteController.class.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 894738ec6..b38e6f4c0 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -282,6 +282,7 @@ class FinancePromoteController extends AdminController $map['s.market_admin_id'] = $adminId; } $map['s.pay_status']=1; + $map['s.is_check']=1; $field= "SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count, SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count, SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as bind_coin_count, @@ -511,6 +512,7 @@ class FinancePromoteController extends AdminController $map['s.market_admin_id'] = $adminId; } $map['s.pay_status']=1; + $map['s.is_check']=1; // dd($map); $field= "SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count, SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count, @@ -775,6 +777,8 @@ class FinancePromoteController extends AdminController $row = 10; } $map['pay_status'] = 1; + $map['is_check'] = 1; + if (!empty(I("game_id"))) { $map['game_id'] = I("game_id"); } @@ -893,6 +897,7 @@ class FinancePromoteController extends AdminController } $map['s.pay_status']=1; + $map['s.is_check']=1; $query = M("spend","tab_")->alias("s") ->field("s.game_id,s.game_name,s.sdk_version,p.partner as partner_name, SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count, @@ -946,7 +951,7 @@ class FinancePromoteController extends AdminController ->join("tab_promote promote ON s.promote_id = promote.id","left") ->join("tab_promote_company company ON promote.company_id = company.id","left"); } - $data = $query->where(['s.pay_status' => 1]) + $data = $query->where(['s.pay_status' => 1,'s.is_check'=>1]) ->where($map) ->find(); return $data; @@ -996,6 +1001,7 @@ class FinancePromoteController extends AdminController $row = 10; } $map['pay_status'] = 1; + $map['is_check'] = 1; if (!empty(I('user_account'))) { $map['tab_spend.user_account'] = array('like','%'.I("user_account").'%'); From b9b497e2557dbbd06f71921b59702060c3c8ac41 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 27 Nov 2020 18:44:49 +0800 Subject: [PATCH 27/39] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=AC=E4=BC=9A?= =?UTF-8?q?=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/FinancePromote/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/FinancePromote/index.html b/Application/Admin/View/FinancePromote/index.html index 545faf957..8657f62fc 100644 --- a/Application/Admin/View/FinancePromote/index.html +++ b/Application/Admin/View/FinancePromote/index.html @@ -81,7 +81,7 @@

公会统计

-

说明：公会相关统计

+

说明：公会相关统计不含不参与结算的订单数据