到店自提

application/controllers/Home.php

@@ -192,4 +192,13 @@ class HomeController extends \Our\Controller_AbstractIndex{
         $otherGoods = $goodsCommonService->getIndexHotSalesGoods($currentAddress);
         $this->success($otherGoods);
     }
+
+    public function testMemberAction(){
+        $memberList = \DAO\MemberModel::getInstance()->getAll();
+        foreach($memberList as $member){
+
+            
+        }
+    }
+
 }
\ No newline at end of file

application/models/DAO/PBundling.php

@@ -173,13 +173,17 @@ class PBundlingModel extends \DAO\AbstractModel {
         $pBundlingDao->tableDelAll($pBundlingDao->tableKeys('*'.\Our\NameConst::blGoods.$goodsCommonId));
     }
 
-    public function delPBundlingListByStoreIdAndBlIds($storeId,$blId){
+    public function delPBundlingListByStoreIdAndBlIds($storeId=false,$blId=false){
+        if($blId){
             \Our\RedisHelper::delCachedFunction(\Redis\Db4\PBundlingRedisModel::getInstance(),array(&$this, 'getList'),array(),array('*'.$blId.'*'));
+        }
+        if($storeId){
             \Our\RedisHelper::delCachedFunction(\Redis\Db4\PBundlingRedisModel::getInstance(),array(&$this, 'getList'),array(),array($storeId));
             $cartRedis = \Redis\Db7\CartRedisModel::getInstance();
             $memberCartKey = \Our\NameConst::memberStoreCartsPrefix.'*_'.$storeId;
             $cartRedis->tableDelAll($cartRedis->tableKeys($memberCartKey));
         }
+    }
 
     /**
      * 类实例

application/models/DAO/Store.php

@@ -435,7 +435,7 @@ class StoreModel extends \DAO\AbstractModel
     public function checkAddressInServiceArea($address, $store)
     {
         $inAreaFlag = \Our\ApiConst::zero;
-        if ($store['express_distribution']) {//如果店铺开启了到店自提和快递配送,则认为存在可用配送方式
+        if ($store['buyer_distribution']) {//如果店铺开启了到店自提和快递配送,则认为存在可用配送方式
             $inAreaFlag = \Our\ApiConst::one;
             return $inAreaFlag;
         }