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

application/models/Business/Store/StoreService.php

@@ -135,7 +135,18 @@ class StoreServiceModel extends \Business\AbstractModel{
             }
         }
         //营业时间
+        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 = '';
+        }
+
         $sellerDistribution = $storeInfo['seller_distribution'];
         $buyerDistribution = $storeInfo['buyer_distribution'];
         return array('storeLabel'=>$storeLabel,'storeName'=>$storeInfo['store_name'],'grade'=>$grade,'fansCount'=>\DAO\FavoritesStoreModel::getInstance()->getFavoritesStoreCountByStoreId($storeId),'favType'=>$favType,'monthlySalesCount'=>$monthlySalesCount,'defaultDeliveryTime'=>$defaultDeliveryTime,'freeShippingPrice'=>$storeInfo['free_shipping_price'],'storeDistance'=>$distince,'storeNotice'=>$storeInfo['store_notice'],'startShippingPrice'=>$storeInfo['start_shipping_price'],'memberId'=>$storeInfo['member_id'],'inStoreService'=>$in_store_service_flag,'adv'=>$adv,'memberId'=>$storeInfo['member_id'],'businessHours'=>$businessHours,'sellerDistribution'=>$sellerDistribution,'buyerDistribution'=>$buyerDistribution,'bannerColor'=>'#ffa92f','isClose'=>$storeInfo['isClose']);