Commit 2ba8ead1 authored by liuyuzhen's avatar liuyuzhen

配送时间问题

parent 57dc9b47
...@@ -106,6 +106,9 @@ class DeliveryFormulaModel extends \DAO\AbstractModel { ...@@ -106,6 +106,9 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
if($nextEndTime>$todayUnixTime*3){ if($nextEndTime>$todayUnixTime*3){
$nextEndTime = $todayUnixTime*3; $nextEndTime = $todayUnixTime*3;
} }
\Our\Log::getInstance()->write($nextStartTime,'/data/log/applog');
\Our\Log::getInstance()->write($nextEndTime,'/data/log/applog');
$nextList = $this->getBuyerFormulaList($nextStartTime,$nextEndTime,$isDefault); $nextList = $this->getBuyerFormulaList($nextStartTime,$nextEndTime,$isDefault);
if($nextList){ if($nextList){
$return = array_merge($return,$nextList); $return = array_merge($return,$nextList);
...@@ -391,8 +394,8 @@ class DeliveryFormulaModel extends \DAO\AbstractModel { ...@@ -391,8 +394,8 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
$startTime = mktime(date('H',$beginTime),60,0,date('m',$beginTime),date('d',$beginTime),date('Y',$beginTime)); $startTime = mktime(date('H',$beginTime),60,0,date('m',$beginTime),date('d',$beginTime),date('Y',$beginTime));
} }
} }
if($startTime+\Our\ApiConst::halfHour<$endTime){ if($beginTime+\Our\ApiConst::halfHour<$endTime){
for($i=$startTime;$i<$endTime;$i = $i+(\Our\ApiConst::halfHour)){ for($i=$beginTime;$i<$endTime;$i = $i+(\Our\ApiConst::halfHour)){
$temp = array(); $temp = array();
$temp['time'] = $i; $temp['time'] = $i;
$temp['isDefault'] = $isDefault; $temp['isDefault'] = $isDefault;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment