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

application/models/DAO/Store.php

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

application/models/Error/CodeConfig.php

@@ -130,6 +130,7 @@ class CodeConfigModel
     const emptyScanStoreId = 40010;
     const emptyScanStoreInfo = 40011;
     const saveScanStoreInfoFailed = 40012;
+    const storeNotOpen = 40013;
 
     //购物车
     const wrongCartType = 50001;
@@ -549,6 +550,7 @@ class CodeConfigModel
             self::emptyScanStoreId => '扫码关注店铺ID为空',
             self::emptyScanStoreInfo => '扫码关注店铺不存在',
             self::saveScanStoreInfoFailed => '扫码店铺保存失败',
+            self::storeNotOpen => '店铺还未配置开启',
 
             //购物车相关
             self::wrongCartType => '加入购物车类型不能为空',