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

application/controllers/Home.php

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

application/library/Order/OrderConfirmUtil.php

@@ -568,7 +568,7 @@ class OrderConfirmUtil {
             $orderLog['log_msg'] = \Our\DescribeConst::addOrderLog;
             $orderLog['log_time']  = TIMESTAMP;
             $orderLog['log_role'] = \Our\DescribeConst::buyer;
-            $orderLog['log_user'] = $this->member['memberName'];
+            $orderLog['log_user'] = addslashes($this->member['memberName']);
             $orderLog['log_msg'] = $logMsg;
             $orderLog['log_orderstate'] = $order['order_state'];
             $orderLogList[] = $orderLog;

application/models/Business/Goods/GoodsCommonService.php

@@ -1363,6 +1363,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
                 break;
             }
         }
+        return true;
     }
 
     /**
@@ -1390,6 +1391,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
             $where['store_id'] = $goodsClass['store_id'];
             $where['goods_state'] = \Our\ApiConst::onlineGoodsState;
             $where['goods_verify'] = \Our\ApiConst::onlineGoodsVerify;
+            $where['is_del'] = \Our\ApiConst::zero;
             if($gcFrom==\Our\ApiConst::one){
                 $where['goods_class_t_id'] = $goodsClass['gc_id_3'];
             }

application/models/Business/Store/StoreService.php

@@ -1156,6 +1156,7 @@ class StoreServiceModel extends \Business\AbstractModel{
         $storeDao = \DAO\StoreModel::getInstance();
         $storeDao->delNearbyStoresCache($cityCode);
         $storeDao->delStoresCacheByCityCode($cityCode);
+        return true;
     }
 
     public function editQmStoreClass(){

application/models/DAO/GoodsClass/StoreOnlineGoodsClass.php

@@ -130,7 +130,9 @@ class StoreOnlineGoodsClassModel extends \DAO\AbstractModel{
         $goodsClass['gc_id_3'] = $goodsCommon['gc_id_3'];
         $goodsClass['store_id'] = $goodsCommon['store_id'];
         $goodsClass['gc_from'] = \Our\ApiConst::zero;
+        if($goodsClass['gc_id_3']){
             $this->addChangedGoodsClass(serialize($goodsClass),$type);
+        }
         if($goodsCommon['goods_class_t_id']){
             $goodsClass['gc_id_3'] = $goodsCommon['goods_class_t_id'];
             $goodsClass['gc_from'] = \Our\ApiConst::one;

application/models/DAO/Member.php

@@ -116,6 +116,9 @@ class MemberModel extends \DAO\AbstractModel
   public function saveInfo($data, $memberId)
   {
     $this->setDb(\Our\DbNameConst::masterDBConnectName);
+    if($data['member_name']){
+      $data['member_name'] = base64_encode($data['member_name']);
+    }
     $result = $this->db->update($this->_tableName)->rows($data)->where(array('member_id' => $memberId))->execute();
     if ($result!==false) {
       $memberDb0Redis = \Redis\Db0\MemberRedisModel::getInstance();

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;
         }

scripts/crontab/push/bridge.php

@@ -21,7 +21,7 @@ $http->on('request', function ($request, $response) {
             $memberDao=$info['className']::getInstance(\Our\DbNameConst::masterDBConnectName);
            echo json_encode($info);
             if(empty($info['params'])){
-                $res=call_user_func_array(array($memberDao,$info['method']));
+                $res=call_user_func_array(array($memberDao,$info['method']),array());
             }else{
                 $res=call_user_func_array(array($memberDao,$info['method']),$info['params']);
             }