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

application/models/Business/Store/StoreService.php

@@ -354,9 +354,16 @@ class StoreServiceModel extends \Business\AbstractModel{
         }
         $address = preg_replace("/\s/",'',$address);
         //营业时间
-        $openingHours = '';
-        if($storeInfo['store_start_time'] && $storeInfo['store_close_time']){
-            $openingHours = $storeInfo['store_start_time'].'-'.$storeInfo['store_close_time'];
+        if($storeInfo['store_start_time'] && $storeInfo['store_close_time']) {
+            if($storeInfo['store_start_time'] == $storeInfo['store_close_time']) {
+                $businessHours = '全天';
+            }elseif ($storeInfo['store_start_time'] > $storeInfo['store_close_time']) {
+                $businessHours = $storeInfo['store_start_time'].' - 次日'.$storeInfo['store_close_time'];
+            }else{
+                $businessHours = $storeInfo['store_start_time'].' - '.$storeInfo['store_close_time'];
+            }
+        }else{
+            $businessHours = '';
         }
         //店铺经营分类
         $goodsClassInstance = \DAO\GoodsClassModel::getInstance();
@@ -370,7 +377,7 @@ class StoreServiceModel extends \Business\AbstractModel{
             }
         }
         list($qualificationPics,$detailImg) = $this->getStoreQualification($storeId,$storeInfo['member_id']);
-        return array('storeName'=>$storeInfo['store_name'],'storeLabel'=>$storeLabel,'fansCount'=>\DAO\FavoritesStoreModel::getInstance()->getFavoritesStoreCountByStoreId($storeId),'clazz'=>$returnClass,'address'=>$address,'storePhone'=>$storeInfo['store_phone'],'openingHours'=>$openingHours,'storeService'=>$storeInfo['store_notice'],"qualificationImage"=>$qualificationPics,'showImage'=>$detailImg);
+        return array('storeName'=>$storeInfo['store_name'],'storeLabel'=>$storeLabel,'fansCount'=>\DAO\FavoritesStoreModel::getInstance()->getFavoritesStoreCountByStoreId($storeId),'clazz'=>$returnClass,'address'=>$address,'storePhone'=>$storeInfo['store_phone'],'openingHours'=>$businessHours,'storeService'=>$storeInfo['store_notice'],"qualificationImage"=>$qualificationPics,'showImage'=>$detailImg);
     }
     public function getRecommendGoodsCache($param,$memberId){
         $storeId = intval($param['storeId']);