Commit 26fe9c4e authored by liuyuzhen's avatar liuyuzhen

购物车数据排序提交

parent c58c4572
...@@ -93,7 +93,7 @@ class CartServiceModel extends \Business\AbstractModel{ ...@@ -93,7 +93,7 @@ class CartServiceModel extends \Business\AbstractModel{
\Error\ErrorModel::throwException(\Error\CodeConfigModel::editDelCartFailed); \Error\ErrorModel::throwException(\Error\CodeConfigModel::editDelCartFailed);
} }
$updateResult = $cartDao->update(array('gmt_update'=>TIMESTAMP),array('goods_id'=>$cart['goods_id'],'buyer_id'=>$memberId)); $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); \Error\ErrorModel::throwException(\Error\CodeConfigModel::editCartUploadCartFailed);
} }
$memberCartKey = \Our\NameConst::memberCartStorePrefix.$memberId; $memberCartKey = \Our\NameConst::memberCartStorePrefix.$memberId;
......
...@@ -197,7 +197,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel { ...@@ -197,7 +197,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
$temp['storeId'] = $storeId; $temp['storeId'] = $storeId;
$temp['storeCarts'] = $storeCarts; $temp['storeCarts'] = $storeCarts;
$temp['inAreaFlag'] = $storeDao->checkAddressInServiceArea($address,$store); $temp['inAreaFlag'] = $storeDao->checkAddressInServiceArea($address,$store);
$result[]=$temp; $result[$storeId]=$temp;
$memberStoreCartsKey = \Our\NameConst::memberStoreCartsPrefix.$memberId.\Our\NameConst::underline.$storeId; $memberStoreCartsKey = \Our\NameConst::memberStoreCartsPrefix.$memberId.\Our\NameConst::underline.$storeId;
$cartRedis->update($memberStoreCartsKey,$temp,\Our\ApiConst::oneHour); $cartRedis->update($memberStoreCartsKey,$temp,\Our\ApiConst::oneHour);
} }
...@@ -208,11 +208,17 @@ class GroupSaleServiceModel extends \Business\AbstractModel { ...@@ -208,11 +208,17 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
unset($tempReturnStoreCartsObj['goodsCommonPrices']); unset($tempReturnStoreCartsObj['goodsCommonPrices']);
unset($tempReturnStoreCartsObj['is_transport']); unset($tempReturnStoreCartsObj['is_transport']);
unset($tempReturnStoreCartsObj['transport_id']); unset($tempReturnStoreCartsObj['transport_id']);
$result[]=$tempReturnStoreCartsObj; $result[$storeId]=$tempReturnStoreCartsObj;
} }
} }
if($result){ 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()); return array('totalCount'=>\Our\ApiConst::zero,'list'=>array());
} }
......
...@@ -213,7 +213,8 @@ class CartModel extends \DAO\AbstractModel{ ...@@ -213,7 +213,8 @@ class CartModel extends \DAO\AbstractModel{
'goodsIds'=>$goodsIds, 'goodsIds'=>$goodsIds,
'goodsCommonIds'=>$goodsCommonIds, 'goodsCommonIds'=>$goodsCommonIds,
'blIds'=>$blIds, 'blIds'=>$blIds,
'cartList'=>$storeCartList 'cartList'=>$storeCartList,
'storeIds'=>$storeIds
); );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment