From 4caa02a76bc40024d6c5ba7b986314ec399aabe6 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Fri, 6 Mar 2020 13:40:00 +0800 Subject: [PATCH] upt --- Application/Admin/Controller/ConsoleController.class.php | 4 ++-- Application/Admin/Controller/GameController.class.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/ConsoleController.class.php b/Application/Admin/Controller/ConsoleController.class.php index e0cd49d15..a92ad24fd 100644 --- a/Application/Admin/Controller/ConsoleController.class.php +++ b/Application/Admin/Controller/ConsoleController.class.php @@ -334,8 +334,8 @@ class ConsoleController extends Think { ->join('tab_partner p on pdw.partner_id = p.id') ->join('tab_game g on pdw.partner_id = g.partner_id') ->join('tab_cp_game_ratio cgr on cgr.game_id = g.id and begin_total_amount = 0 and is_del = 0') - ->join('tab_spend s on s.game_id = g.id') - ->where(['pdw.status'=>1, 's.pay_status'=>1]) + ->join('tab_game_data s on s.game_id = g.id') + ->where(['pdw.status'=>1]) ->group('pdw.id') ->select(); if (!$warns) return; diff --git a/Application/Admin/Controller/GameController.class.php b/Application/Admin/Controller/GameController.class.php index 3004b3d80..006e3b424 100644 --- a/Application/Admin/Controller/GameController.class.php +++ b/Application/Admin/Controller/GameController.class.php @@ -903,7 +903,7 @@ class GameController extends ThinkController $count = M('partner_divide_warn', 'tab_')->alias('pdw')->join("tab_game g on pdw.partner_id = g.partner_id", 'left')->group('pdw.id')->where($map)->count(); if (!empty($list)) { foreach ($list as &$item) { - $item['total_amount'] = M('spend', 'tab_')->where(['pay_status'=>1, 'game_id'=>['in',explode(',', $item['game_id'])]])->sum('pay_amount'); + $item['total_amount'] = M('game_data', 'tab_')->where(['game_id'=>['in',explode(',', $item['game_id'])]])->sum('pay_amount'); } } $page = set_pagination($count, $row);