12.28功能提交

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);