配送时间相关

application/models/DAO/DeliveryFormula.php

@@ -225,7 +225,9 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
                 $tenMinute =15;
                 $forthMinute = 45;
             }
-            if($currentMinute>$tenMinute&&$currentMinute<30){
+            if($currentMinute<=$tenMinute){
+                $currentTime = mktime(date('H',$currentTime),0,0,date('m',$currentTime),date('d',$currentTime),date('Y',$currentTime));
+            }else if($currentMinute>$tenMinute&&$currentMinute<=$forthMinute){
                 $currentTime = mktime(date('H',$currentTime),30,0,date('m',$currentTime),date('d',$currentTime),date('Y',$currentTime));
             }else if($currentMinute>$forthMinute){
                 $currentTime = mktime(date('H',$currentTime),60,0,date('m',$currentTime),date('d',$currentTime),date('Y',$currentTime));
@@ -385,14 +387,14 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
         if($initMinute==0||$initMinute==30){
             $startTime = $beginTime;
         }else{
-            if($initMinute<30){
+            if($initMinute<10){
                 $startTime = mktime(date('H',$beginTime),30,0,date('m',$beginTime),date('d',$beginTime),date('Y',$beginTime));
             }else if($initMinute<60){
                 $startTime = mktime(date('H',$beginTime),60,0,date('m',$beginTime),date('d',$beginTime),date('Y',$beginTime));
             }
         }
-        if($beginTime+\Our\ApiConst::halfHour<$endTime){
-            for($i=$beginTime;$i<$endTime;$i = $i+(\Our\ApiConst::halfHour)){
+        if($startTime+\Our\ApiConst::halfHour<$endTime){
+            for($i=$startTime;$i<$endTime;$i = $i+(\Our\ApiConst::halfHour)){
                 $temp = array();
                 $temp['time'] = $i;
                 $temp['isDefault'] = $isDefault;