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

application/models/Business/Cart/CartService.php

@@ -93,7 +93,7 @@ class CartServiceModel extends \Business\AbstractModel{
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::editDelCartFailed);
         }
         $updateResult = $cartDao->update(array('gmt_update'=>TIMESTAMP),array('goods_id'=>$cart['goods_id'],'buyer_id'=>$memberId));
-        if(!$updateResult){
+        if($updateResult===false){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::editCartUploadCartFailed);
         }
         $memberCartKey = \Our\NameConst::memberCartStorePrefix.$memberId;

application/models/Business/Goods/GroupSaleService.php

@@ -192,12 +192,31 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
                     }
                 }
                 if(isset($storeCarts)&&count($storeCarts)>\Our\ApiConst::zero){
+                    $offlineCarts = array();
+                    $newstoreCarts= array();
+                    foreach ($storeCarts as  $row){
+                        if($row['goodsState']==\Our\ApiConst::cartGoodsOnline){
+                            $newstoreCarts[] = $row;
+                        }else{
+                            $offlineCarts[] = $row;
+                        }
+                    }
+                    if($offlineCarts){
+                        foreach($offlineCarts  as $key=>$cartObj){
+                            $goodsState[$key] = $cartObj['goodsState'];
+                        }
+                        array_multisort($goodsState, SORT_DESC, $offlineCarts);
+                        foreach($offlineCarts as $temp){
+                            $newstoreCarts[] = $temp;
+                        }
+                    }
+                    $storeCarts = $newstoreCarts;
                     $store = $storeDao->get($storeId,false);
                     $temp['storeName'] = $store['store_name'];
                     $temp['storeId'] = $storeId;
                     $temp['storeCarts'] = $storeCarts;
                     $temp['inAreaFlag'] = $storeDao->checkAddressInServiceArea($address,$store);
-                    $result[]=$temp;
+                    $result[$storeId]=$temp;
                     $memberStoreCartsKey = \Our\NameConst::memberStoreCartsPrefix.$memberId.\Our\NameConst::underline.$storeId;
                     $cartRedis->update($memberStoreCartsKey,$temp,\Our\ApiConst::oneHour);
                 }
@@ -208,11 +227,17 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
                 unset($tempReturnStoreCartsObj['goodsCommonPrices']);
                 unset($tempReturnStoreCartsObj['is_transport']);
                 unset($tempReturnStoreCartsObj['transport_id']);
-                $result[]=$tempReturnStoreCartsObj;
+                $result[$storeId]=$tempReturnStoreCartsObj;
             }
         }
+
         if($result){
-            return array('totalCount'=>count($storeCartList),'list'=>$result);
+            $storeIds = $cartListData['storeIds'];
+            $newResult = array();
+            foreach($storeIds as $key){
+                $newResult[] = $result[$key];
+            }
+            return array('totalCount'=>count($storeCartList),'list'=>$newResult);
         }
         return array('totalCount'=>\Our\ApiConst::zero,'list'=>array());
     }

application/models/DAO/Cart/Cart.php

@@ -213,7 +213,8 @@ class CartModel extends \DAO\AbstractModel{
             'goodsIds'=>$goodsIds,
             'goodsCommonIds'=>$goodsCommonIds,
             'blIds'=>$blIds,
-            'cartList'=>$storeCartList
+            'cartList'=>$storeCartList,
+            'storeIds'=>$storeIds
         );
     }