From 2fe556a03bce3df5ad8fdcfdc92583d8ea945ac9 Mon Sep 17 00:00:00 2001
From: colly_wyx <wangyixiong_007@163.com>
Date: Thu, 29 Mar 2018 12:01:28 +0800
Subject: [PATCH] 新增广告调用接口
---
Yfs/Domain/DataDaily.php | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/Yfs/Domain/DataDaily.php b/Yfs/Domain/DataDaily.php
index 3074457..57cf6f7 100644
--- a/Yfs/Domain/DataDaily.php
+++ b/Yfs/Domain/DataDaily.php
@@ -7,6 +7,7 @@
public function __construct(){
//DI()->redis = new Redis_Lite(DI()->config->get('app.redis.servers'));
$this->model = new Model_DataDaily();
+ $this->hourly_model = new Model_DataHourly();
}
/**
@@ -19,14 +20,20 @@
public function getUserDataList($user_id, $start_time, $end_time){
$start_time = strtotime($start_time);
$end_time = strtotime($end_time);
- $diff_days = ($end_time - $start_time) / 86400;
- $total_days = $diff_days + 1;//���������������������
- $step = ($total_days - $total_days % 7) / 7;
- $days_arr= array();
- for($i = 0; $i < 7*$step ; $i+=$step){
- $days_arr[] = date('Y-m-d', strtotime('+'.$i.' day', $start_time));
+ if($end_time > $start_time){
+ $diff_days = ($end_time - $start_time) / 86400;
+ $total_days = $diff_days + 1;//���������������������
+ $step = ($total_days - $total_days % 7) / 7;
+ $days_arr= array();
+ for($i = 0; $i < 7*$step ; $i+=$step){
+ $days_arr[] = date('Y-m-d', strtotime('+'.$i.' day', $start_time));
+ }
+ $result = $this->model->getList(array('user_id' => $user_id, 'date' => array('$in' => $days_arr)));
}
- $result = $this->model->getList(array('user_id' => $user_id, 'date' => array('$in' => $days_arr)));
+ else{
+ $result = $this->hourly_model->getList(array('user_id' => $user_id, 'date' => $start_time), array(), array('time_level' => 1));
+ }
+
return $result;
}
--
Gitblit v1.8.0