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

application/controllers/Index.php

@@ -66,9 +66,12 @@ class IndexController extends \Our\Controller_Abstract  {
         if($paramsStr['type']==\Our\ApiConst::shareStore || $paramsStr['type']==\Our\ApiConst::shareSaler){
             $begin=strtotime($paramsStr['storeStartTime']);
             $end=strtotime($paramsStr['storeCloseTime']);
-            if($begin>=$end){
+            if($begin>$end){
                 $paramsStr['storeCloseTime']=\Our\DescribeConst::storeCloseTimePre.date('H:i',$end+\Our\ApiConst::oneDaySecond);
             }
+            if($begin==$end){
+                $paramsStr['storeCloseTime']=\Our\DescribeConst::allDay;
+            }
 
         }
         if($paramsStr['startShippingPrice']){

application/library/Our/Common.php

@@ -459,7 +459,7 @@ class Common
         return $str;
     }
     //合并一对多列表
-    public static function intergrateOneToMany($list1,$list2,$mergekey1,$mergekey2,$listName='orderGoods'){
+    public static function intergrateOneToMany($list1,$list2,$mergekey1,$mergekey2,$listName='orderGoods',$sortField='gmtUpdate'){
         $mergeArray=array();
         $list2key=array();
         foreach($list1 as $value){
@@ -472,7 +472,7 @@ class Common
             }
         }
         $orders=array_values($list2key);
-        array_multisort(array_column($orders,'gmtUpdate'),SORT_DESC,$orders);
+        array_multisort(array_column($orders,$sortField),SORT_DESC,$orders);
         return $orders;
     }
 //    //合并一对多列表

application/library/Our/DescribeConst.php

@@ -68,6 +68,7 @@ class DescribeConst
     const addCartSuccess = '加入购物车成功';
 
     const storeCloseTimePre='次日';
+    const allDay='全天';
     const setMessageSuccess='消息设置成功';
 
     const editCartSuccess = '编辑购物车成功';

application/models/Business/Store/ShopkeeperService.php

@@ -320,7 +320,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
                 //$orderCommons = $orderCommonDao->getAllByOrderIds($orderIds, $orderCommonDao->orderCommonField);
                 $ordersOrderCommons = Common::intergrateOneToOne($orders, $qmDeliveryManLogs['list'], 'orderId', 'orderId');
                 $ordersOrderCommons=Common::intergrateOneToOne($ordersOrderCommons, $orderCommons, 'orderId', 'orderId');
-                $orderMerge = \Our\Common::intergrateOneToMany($ordersOrderCommons, $orderGoods, 'orderId', 'orderId', 'orderGoods');
+                $orderMerge = \Our\Common::intergrateOneToMany($ordersOrderCommons, $orderGoods, 'orderId', 'orderId', 'orderGoods','addTime');
                 foreach ($orderMerge as &$value) {
                     $value['orderStateName'] = $orderDao->getStatusText($value);
                     $value['orderText'] = $orderDao->getText($value, ApiConst::orderListDescribe);
@@ -407,7 +407,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
     public function getOrders($memberId, $pageIndex, $pageSize, $orderState, $keyword)
     {
 
-        $order = array('gmt_update' => 'desc');
+        $order = array('add_time' => 'desc');
         $orderDao=\DAO\Order\OrderModel::getInstance();
         $storeId = $this->_getStoreByMemberId($memberId);
         if (empty($storeId)) {
@@ -441,7 +441,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
 //                        'gmt_update'=>'asc'
 //                    );
                     $order=array(
-                        'gmt_update'=>'desc'
+                        'add_time'=>'desc'
                     );
 //                    $where .= ' and han_order.shipping_type=' . ApiConst::bySeller;
                     $where=$orderDao->getWaitDeliveryCondition($storeId);
@@ -449,7 +449,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
 
             } else {
                 $order=array(
-                    'gmt_update'=>'desc'
+                    'add_time'=>'desc'
                 );
                 if (!empty($orderState)) {
                     $where .= ' and han_order.order_state=' . $orderState;