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

application/models/Business/Store/StoreService.php

@@ -82,7 +82,7 @@ class StoreServiceModel extends \Business\AbstractModel{
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyStoreId);
         }
 
-        list($storeInfo,$storeLabel) = \DAO\StoreModel::getInstance()->get($storeId,true,false);
+        list($storeInfo,$storeLabel) = \DAO\StoreModel::getInstance()->get($storeId,true);
         if((int)$param['isScan'] > 0) {
             //扫码进入
             if($memberId > 0) {

application/models/DAO/Store.php

@@ -354,7 +354,8 @@ class StoreModel extends \DAO\AbstractModel
         if ($storeInfo['open_flag'] != 1 || $storeInfo['store_state'] != 1) {
             if ($reportError) {
                 if($storeInfo['open_flag'] != 1) {
-                    \Error\ErrorModel::throwException(\Error\CodeConfigModel::storeNotOpen);
+//                    \Error\ErrorModel::throwException(\Error\CodeConfigModel::storeNotOpen);
+                    \Error\ErrorModel::throwException(\Error\CodeConfigModel::storeNotExistOrClose);
                 }else{
                     \Error\ErrorModel::throwException(\Error\CodeConfigModel::storeNotExistOrClose);
                 }