Merge branch 'feature/ip_forbit' of wmtx/platform into release

测试资源定时脚本修正

Application/Admin/Controller/TimingController.class.php

@@ -287,11 +287,11 @@ class TimingController extends AdminController {
 
             $data = M('spend','tab_')
                 ->field("sum(`pay_amount`) as pay_amount,promote_id,promote_account,tab_spend.game_id,tab_spend.game_name,tab_spend.server_id,tab_spend.server_name,CASE WHEN old_value_ratio is NULL THEN 0 ELSE sum(`pay_amount`) * old_value_ratio END as available_balance")
-                ->join('left join tab_resource_verify_config as config on tab_spend.game_id = config.game_id')
+                ->join('left join tab_resource_verify_config as config on tab_spend.game_id = config.game_id and config.status = 1')
                 ->where(['pay_status'=>1,'pay_way'=>['egt',1],'pay_time'=>['between',[$start,$start+86399]]])
                 ->group('promote_id,game_id,server_id')
                 ->select();
-//            var_dump($data);die();
+//            dump($data);die();
 
             foreach ($data as $key => $value) {