购物车编辑提示店铺关闭问题

application/models/Business/Cart/CartService.php

@@ -55,9 +55,9 @@ class CartServiceModel extends \Business\AbstractModel{
      * @param $pBundlind
      */
     public function editCart($data,$cart,$memberId,$pBundlind=null){
-        $this->validEditCart($data,$cart,$memberId,$pBundlind);
+        $validReturnData = $this->validEditCart($data,$cart,$memberId,$pBundlind);
         $cartDao = \DAO\Cart\CartModel::getInstance(\Our\DbNameConst::masterDBConnectName);
-        $cartArray = $this->getFormattedCartDataForEdit($data,$cart,$memberId,$pBundlind);
+        $cartArray = $this->getFormattedCartDataForEdit($data,$cart,$memberId,$pBundlind,$validReturnData);
         $result = $cartDao->update($cartArray['cart'],array('cart_id'=>$cart['cart_id']));
         if(!$result){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::editCartFailed);
@@ -148,9 +148,9 @@ class CartServiceModel extends \Business\AbstractModel{
      * @return array
      * @throws \Our\Exception
      */
-    public function getFormattedCartDataForEdit($data,$cart,$memberId,$pBundling = null){
+    public function getFormattedCartDataForEdit($data,$cart,$memberId,$pBundling = null,$validReturnData){
         if($cart['type'] == \Our\ApiConst::addGoodsToCart){
-            $newCart = $this->getCommonGoodsCartData($data['goodsId'],$data['goodsNum'],$memberId);
+            $newCart = $this->getCommonGoodsCartData($data['goodsId'],$data['goodsNum'],$memberId,$validReturnData);
         }else if($cart['type'] == \Our\ApiConst::addBundingToCart){
             $newCart = $this->getPBundlingGoodsCartData($data['goodsNum'],$memberId,$pBundling);
         }
@@ -358,6 +358,7 @@ class CartServiceModel extends \Business\AbstractModel{
             if(!$goodsValidStatus){
                 \Error\ErrorModel::throwException($goodsDao->errorCode);
             }
+            return $goodsValidStatus;
         }else if($cart['type'] == \Our\ApiConst::addBundingToCart){
             if(!$pBundling){
                 \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyCartBundling);
@@ -367,6 +368,7 @@ class CartServiceModel extends \Business\AbstractModel{
             }
             $this->checkBundlingGoods($pBundling,$data['goodsNum'],true);
         }
+        return true;
     }
 
     /**

application/models/DAO/Goods.php

@@ -111,7 +111,7 @@ class GoodsModel extends \DAO\AbstractModel {
             $this->errorCode = \Error\CodeConfigModel::noStorageForCart;
             return false;
         }
-        return true;
+        return $goods;
     }
 
     /**