Commit b6ad0ba6 authored by liuyuzhen's avatar liuyuzhen

配送时间问题

parent 07ad3526
......@@ -83,7 +83,6 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
}
$return=array();
$todayUnixTime = mktime(0,0,0,date('m'),date('d'),date('Y'));
\Our\Log::getInstance()->write($todayUnixTime,'/data/log/applog');
$todayList = $this->getBuyerFormulaList($currentTime,$todayEndTime,\Our\ApiConst::one);
$isDefault = \Our\ApiConst::zero;
if($todayList){
......@@ -103,12 +102,10 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
}
$nextStartTime = $todayStartTime + \Our\ApiConst::oneDaySecond*2;
$nextEndTime = $todayEndTime + \Our\ApiConst::oneDaySecond*2;
if($nextEndTime>$todayUnixTime*3){
$nextEndTime = $todayUnixTime*3;
if($nextEndTime>($todayUnixTime+\Our\ApiConst::oneDaySecond*3)){
$nextEndTime = ($todayUnixTime+\Our\ApiConst::oneDaySecond*3);
}
\Our\Log::getInstance()->write($nextStartTime,'/data/log/applog');
\Our\Log::getInstance()->write($nextEndTime,'/data/log/applog');
$nextList = $this->getBuyerFormulaList($nextStartTime,$nextEndTime,$isDefault);
if($nextList){
$return = array_merge($return,$nextList);
......
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