Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into master_dev

application/library/Order/OrderConfirmUtil.php

@@ -73,9 +73,6 @@ class OrderConfirmUtil {
         $this->memberId = $memberId;
         $this->member = \DAO\MemberModel::getInstance()->getInfo($this->memberId);
         $this ->address = $this->checkCurrentAddress($currentAddress,$this->memberId);
-        if(!$this->address){
-            \Error\ErrorModel::throwException(\Error\CodeConfigModel::noAddressForOrder);
-        }
         //if($this ->address['addressId'] == )
         $this->postData = json_decode($data['param'],true);
         if(!$this->postData){
@@ -158,6 +155,9 @@ class OrderConfirmUtil {
     }
 
     public function checkOneStoreData($temp){
+        if(!$this->address){
+            \Error\ErrorModel::throwException(\Error\CodeConfigModel::noAddressForOrder);
+        }
         if(!$temp['storeId']){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyStoreIdForOrder);
         }
@@ -194,6 +194,11 @@ class OrderConfirmUtil {
      * @throws \Exception
      */
     public function checkOneStoreDataNew($temp){
+        if($temp['deliveryType']==\Our\ApiConst::deliveryStore){
+            if(!$this->address){
+                \Error\ErrorModel::throwException(\Error\CodeConfigModel::noAddressForOrder);
+            }
+        }
         if(!$temp['storeId']){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyStoreIdForOrder);
         }

application/library/Our/ApiConst.php

@@ -24,7 +24,7 @@ class ApiConst
 
     const halfHour = 1800;
     //预警时间
-    const storageAlarmHour = 100000000000000;
+    const storageAlarmHour = 60;
 
     const twoMinSecond = 120;
 

application/library/Our/Controller/Abstract.php

@@ -48,8 +48,8 @@ abstract class Controller_Abstract extends \Yaf\Controller_Abstract {
         $data['data']=array();
         $data['data'] =$this->req[NameConst::data];
         if(APP_ENV=='test' || APP_ENV=='pre'){
-            $log = \Our\Log::getInstance();
-            $log->write(json_encode($data));
+//            $log = \Our\Log::getInstance();
+//            $log->write(json_encode($data));
         }
         header("Access-Control-Allow-Origin: *");
         header('Access-Control-Allow-Method: *');

application/models/Business/Goods/GoodsCommonService.php

@@ -460,8 +460,8 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
         $goodsRedis = \Redis\Db4\GoodsRedisModel::getInstance();
         $onlineStorageGoodsKey = \Our\NameConst::onlineStorageGoodsPrefix.$goodsCommonId;
         $onlineStorageGoods = $goodsRedis->tableHGAll($onlineStorageGoodsKey);
-        if(count($goods) > 1){
-            foreach (unserialize($commonInfo['goods_attr']) as $k=>$v){
+        if($goodsAttr = unserialize($commonInfo['goods_attr'])){
+            foreach ($goodsAttr as $k=>$v){
                 $tempArr = array('attrName'=>$k,'attrValue'=>$v,'isPrimeAttribute'=>0,'images'=>[]);
                 if(key_exists($k,$attrImage)){
                     foreach ($v as $v1){

application/models/Business/Order/OrderService.php

@@ -968,8 +968,10 @@ class OrderServiceModel extends \Business\AbstractModel
         $orderIds = array();
         $orderNos = array();
         $orderState = \Our\ApiConst::one;
+        $dlyoPickupCode = \Our\NameConst::emptyString;
         foreach ($orderList as $order) {
             $orderNos[] = $order['order_sn'];
+            $dlyoPickupCode = substr($order['order_sn'], ApiConst::positionPickupCodeBegin);
             if ($order['order_state'] == \Our\ApiConst::orderStateWaitPay) {
                 $orderTips = \Our\DescribeConst::payFailedTips;
                 $orderSubTips = \Our\DescribeConst::payFailedSubTips;
@@ -998,7 +1000,6 @@ class OrderServiceModel extends \Business\AbstractModel
                     $orderContent['payway'] = \Our\DescribeConst::afterPay;
                 }
                 $orderContent['orderAmount'] = $order['order_amount'];
-                $orderContent['dlyoPickupCode'] = substr($order['order_sn'], ApiConst::positionPickupCodeBegin);
                 $orderContents[]=$orderContent;
             }
             $orderIds[] = $order['order_id'];
@@ -1027,6 +1028,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $return['orderTips'] = $orderTips;
         $return['orderSubTips'] = $orderSubTips;
         $return['orderContents'] = $orderContents;
+        $return['dlyoPickupCode'] =$dlyoPickupCode;
         $return['coupons'] = $this->getGiftCouponsByOrderIds($orderIds, $memberId);
         return $return;
     }

application/models/DAO/DeliveryFormula.php

@@ -82,8 +82,7 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
             $currentTime = $todayStartTime;
         }
         $return=array();
-        $time = date('Y-m-d',$currentTime);
-        $todayUnixTime = strtotime($time);
+        $todayUnixTime = mktime(0,0,0,date('m'),date('d'),date('Y'));
         $todayList = $this->getBuyerFormulaList($currentTime,$todayEndTime,\Our\ApiConst::one);
         $isDefault = \Our\ApiConst::zero;
         if($todayList){
@@ -103,16 +102,26 @@ 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);
         }
+
         $nextList = $this->getBuyerFormulaList($nextStartTime,$nextEndTime,$isDefault);
         if($nextList){
             $return = array_merge($return,$nextList);
         }
         if($return){
+            $newReturn = array();
+            foreach($return as $val){
+                $keyTemp= strtotime(date('Y-m-d',$val[0]['time']));
+                if(isset($newReturn[$keyTemp])){
+                    $newReturn[$keyTemp] = array_merge($newReturn[$keyTemp],$val);
+                }else{
+                    $newReturn[$keyTemp]=$val;
+                }
+            }
             $returnList = array();
-            foreach($return as $key=>$value){
+            foreach($newReturn as $key=>$value){
                 $dayList = array();
                 $dayList['time']= strtotime(date('Y-m-d',$value[0]['time']));
                 $dayList['list']= $value;
@@ -270,8 +279,17 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
             $return = array_merge($return,$nextList);
         }
         if($return){
+            $newReturn = array();
+            foreach($return as $val){
+                $keyTemp= strtotime(date('Y-m-d',$val[0]['time']));
+                if(isset($newReturn[$keyTemp])){
+                    $newReturn[$keyTemp] = array_merge($newReturn[$keyTemp],$val);
+                }else{
+                    $newReturn[$keyTemp]=$val;
+                }
+            }
             $returnList = array();
-            foreach($return as $key=>$value){
+            foreach($newReturn as $key=>$value){
                 $dayList = array();
                 $dayList['time']= strtotime(date('Y-m-d',$value[0]['time']));
                 $dayList['list']= $value;
@@ -373,8 +391,8 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
                 $startTime = mktime(date('H',$beginTime),60,0,date('m',$beginTime),date('d',$beginTime),date('Y',$beginTime));
             }
         }
-        if($startTime+\Our\ApiConst::halfHour<$endTime){
-            for($i=$startTime;$i<$endTime;$i = $i+(\Our\ApiConst::halfHour)){
+        if($beginTime+\Our\ApiConst::halfHour<$endTime){
+            for($i=$beginTime;$i<$endTime;$i = $i+(\Our\ApiConst::halfHour)){
                 $temp = array();
                 $temp['time'] = $i;
                 $temp['isDefault'] = $isDefault;