diff --git a/api/controllers/plan/Order.php b/api/controllers/plan/Order.php index 82928a23..33bffecd 100644 --- a/api/controllers/plan/Order.php +++ b/api/controllers/plan/Order.php @@ -482,14 +482,13 @@ class Order extends CI_Controller{ public function send_aggs_biz_ding_piao_rpt(){ $params = $this->input->get(); $hour = date('H.i'); - if ( !($hour == 17.50 || $hour == 22.00 || $params['sd'])) { + if ( !($hour == 17.50 || $hour == 23.00 || $params['sd'])) { return false; } $today_start = $today_end = $total_start = $total_end = $title_today = $title_ding_today = $title_ding = $title_piao_today = $title_piao = ''; if ($params['test']){ $today_start = "2021-12-01 00:00:00"; - $today_end = date('Y-m-d 00:00:00', strtotime('+1 day')); $today_end = '2022-06-06'; $total_start = "2021-12-01 00:00:00"; $total_end = date('Y-m-01 00:00:00', strtotime('+1 month')); diff --git a/common/libraries/receiver/Orders_v2_entity.php b/common/libraries/receiver/Orders_v2_entity.php index 059e88a6..92da7fa0 100644 --- a/common/libraries/receiver/Orders_v2_entity.php +++ b/common/libraries/receiver/Orders_v2_entity.php @@ -1554,8 +1554,8 @@ class Orders_v2_entity{ 'title_font_size' =>16,//报表名称字体大小 'font_ulr' => realpath('./static/fonts/msyh.ttc'),//字体文件路径 'text_size' => 12,//正文字体大小 - 'text_size_middle' => 14,//中间字体大小 - 'text_size_big' => 16,//加大字体大小 + 'text_size_middle' => 12,//中间字体大小 14 + 'text_size_big' => 12,//加大字体大小 16 'row_hight' => 30,//每行数据行高 'filed_id_width' => 60,//序号列的宽度 'filed_name_width' => 200,//玩家名称的宽度