From e84ce5629383dd5fe5f39b1636021d7a66f8361d Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Tue, 29 Dec 2020 17:05:23 +0800 Subject: [PATCH] =?UTF-8?q?12.28=E5=8A=9F=E8=83=BD=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/TimingController.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php index c85bebd81..29fed092b 100644 --- a/Application/Admin/Controller/TimingController.class.php +++ b/Application/Admin/Controller/TimingController.class.php @@ -830,6 +830,7 @@ class TimingController extends AdminController { continue; } + $amount_time['is_check'] = ['neq',2]; $amount_time['tab_spend.pay_status'] = 1; $amount_time['pay_way'] = ['egt',0]; $amount_time['_string'] = "payed_time between {$statement_begin_time} and {$statement_end_time} and relation_game_id={$v['relation_game_id']}"; @@ -980,7 +981,7 @@ class TimingController extends AdminController { ->join("left join tab_game game on tab_spend.game_id = game.id") ->join("left join tab_promote promote on tab_spend.promote_id = promote.id") ->where($map) - ->where(['payed_time'=>['between',[$begintime,$endtime]],'company_id'=>$company_id,'relation_game_id'=>$relation_game_id,'market_admin_id'=>$admin_id]) + ->where(['payed_time'=>['between',[$begintime,$endtime]],'company_id'=>$company_id,'relation_game_id'=>$relation_game_id,'market_admin_id'=>$admin_id,'is_check'=>['neq',2]]) ->group("tab_spend.id") ->select(false);