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

application/models/Business/Store/StoreService.php

@@ -60,7 +60,6 @@ class StoreServiceModel extends \Business\AbstractModel{
                 $favoritesStoreDao = \DAO\FavoritesStoreModel::getInstance();
                 $result = $favoritesStoreDao->insertAll($storeMembers);
             }else{
-                \Our\Log::getInstance()->write($param['key'].'无会员','/data/log/special');
                 $sess=\Yaf\Session::getInstance();
                 $scan_store_ids = $sess->get('scan_store_ids');
                 if($scan_store_ids){
@@ -73,7 +72,6 @@ class StoreServiceModel extends \Business\AbstractModel{
                 }else{
                     $scan_store_ids = ''.$storeId;
                 }
-                \Our\Log::getInstance()->write($scan_store_ids.'无会员','/data/log/special');
                 $sess['scan_store_ids'] = $scan_store_ids;
                 if($param['sid']) {
                     $scan_sale_ids = $sess->get('scan_sale_ids');

application/models/Business/User/MemberService.php

@@ -311,6 +311,9 @@ class MemberServiceModel extends \Business\AbstractModel
         $sess=\Yaf\Session::getInstance();
         $scan_store_ids = $sess->get('scan_store_ids');//扫码带入的店铺ID
         if($scan_store_ids){
+            if(!is_array($scan_store_ids)){
+                $scan_store_ids = explode(',',$scan_store_ids);
+            }
             $storeMembers = array();
             foreach($scan_store_ids as $storeId){
                 $storeMember = array();