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

application/models/Business/User/MemberService.php

@@ -386,7 +386,8 @@ class MemberServiceModel extends \Business\AbstractModel
             $saleIds = array_keys($scan_sale_ids);
             $saleList = \DAO\SaleModel::getInstance()->getList(array('sale_id'=>array('in',$saleIds)),'sale_id,sale_act_id,member_id');
             $saleMembers = array();
-            foreach($saleList as $sale){
+            if($saleList&&$saleList['list']){
+                foreach($saleList['list'] as $sale){
                     $saleMember = array();
                     $saleMember['member_id'] = $memberId;
                     $saleMember['store_id'] = $scan_sale_ids[$sale['sale_id']];
@@ -397,6 +398,7 @@ class MemberServiceModel extends \Business\AbstractModel
                 $resultSaleMember = \DAO\SaleMemberModel::getInstance()->insertAllOrUpdate($saleMembers);
                 return $resultSaleMember;
             }
+        }
         return true;
     }