Commit 91cae03a authored by liuyuzhen's avatar liuyuzhen

配送时间

parent 1780708a
......@@ -149,8 +149,9 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
break;
}
}
$expriseStartTime += $deliveryIntval*\Our\ApiConst::oneMinute;
if($expriseStartTime<$todayEndTime){
$expriseData = $this->getTomorrowFormulaList($expriseStartTime+$deliveryIntval*\Our\ApiConst::oneMinute,$todayEndTime,$deliveryIntval*\Our\ApiConst::oneMinute,$minFee,$myCurrentStartTime);
$expriseData = $this->getTomorrowFormulaList($expriseStartTime,$todayEndTime,$deliveryIntval*\Our\ApiConst::oneMinute,$minFee,$myCurrentStartTime);
if($expriseData){
$returnData = array_merge($expriseData,$returnData);
}
......
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