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

application/library/Store/StoreUtil.php

@@ -16,9 +16,7 @@ class StoreUtil {
         $inAreaFlag = false ;
         $qmStoreClassDao = \DAO\QmStoreClassModel::getInstance();
         $qmClassCon['store_id'] = $storeId;
-        $qmClassCon['is_charged'] = 1;
-        $qmClassCon['class_style'] = 2;
-        $qmSignScopeList = \Our\RedisHelper::cachedFunction(\Redis\Db6\QmStoreClassRedisModel::getInstance(),array(&$qmStoreClassDao, 'selectByWhere'),array($qmClassCon,'sign_scope'),\Our\ApiConst::oneHour,array($storeId));
+        $qmSignScopeList = \Our\RedisHelper::cachedFunction(\Redis\Db6\QmStoreClassRedisModel::getInstance(),array(&$qmStoreClassDao, 'getStoreSignClasses'),array($qmClassCon,'sign_scope'),\Our\ApiConst::oneHour,array('store'.$storeId));
         if($qmSignScopeList){
             foreach($qmSignScopeList as $qmSignScope){
                 if($qmSignScope['sign_scope']){
@@ -43,9 +41,7 @@ class StoreUtil {
         $inAreaFlag = false ;
         $qmStoreClassDao = \DAO\QmStoreClassModel::getInstance();
         $qmClassCon['store_id'] = $storeId;
-        $qmClassCon['is_charged'] = 1;
-        $qmClassCon['class_style'] = 2;
-        $qmSignScopeList = \Our\RedisHelper::cachedFunction(\Redis\Db6\QmStoreClassRedisModel::getInstance(),array(&$qmStoreClassDao, 'selectByWhere'),array($qmClassCon,'sign_scope'),\Our\ApiConst::oneHour,array($storeId));
+        $qmSignScopeList = \Our\RedisHelper::cachedFunction(\Redis\Db6\QmStoreClassRedisModel::getInstance(),array(&$qmStoreClassDao, 'getStoreSignClasses'),array($qmClassCon,'sign_scope'),\Our\ApiConst::oneHour,array('store'.$storeId));
         if($qmSignScopeList){
             foreach($qmSignScopeList as $qmSignScope){
                 if($qmSignScope['sign_scope']){

application/models/Business/Goods/GoodsClassService.php

@@ -30,11 +30,11 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
      */
     public function getSignClassesByCityCode($cityCode){
         $qmStoreClassCon['city_code'] = $cityCode;
-        $qmStoreClassCon['class_style'] = \Our\ApiConst::signClassStyle;
-        $qmStoreClassCon['is_charged'] = \Our\ApiConst::one;
+        /*$qmStoreClassCon['class_style'] = \Our\ApiConst::signClassStyle;
+        $qmStoreClassCon['is_charged'] = \Our\ApiConst::one;*/
         $storeField = 'gc_id,sign_scope,gc_parent_id,store_id';
         $qmStoreClassDao = \DAO\QmStoreClassModel::getInstance();
-        $signStoreClasses = \Our\RedisHelper::cachedFunction(\Redis\Db6\QmStoreClassRedisModel::getInstance(),array(&$qmStoreClassDao, 'getStoreClasses'),array($qmStoreClassCon,$storeField),\Our\ApiConst::oneHour,array($cityCode));
+        $signStoreClasses = \Our\RedisHelper::cachedFunction(\Redis\Db6\QmStoreClassRedisModel::getInstance(),array(&$qmStoreClassDao, 'getStoreSignClasses'),array($qmStoreClassCon,$storeField),\Our\ApiConst::oneHour,array($cityCode));
         return $signStoreClasses;
     }
 

application/models/Business/Store/StoreService.php

@@ -735,6 +735,12 @@ class StoreServiceModel extends \Business\AbstractModel{
         $storeRedis = \Redis\Db6\StoreRedisModel::getInstance();
         $signStoreKey = \Our\NameConst::signStoreIdsPrefix.crc32(serialize($position));
         $signStoreIds = $storeRedis->find($signStoreKey, \Our\ApiConst::oneHour);
+        if(!$signStoreIds){
+            $signStoreInfo = \Business\Goods\GoodsClassServiceModel::getInstance()->getSignStoreInfo($position);
+            if($signStoreInfo){
+                $signStoreIds = $signStoreInfo['signStoreIds'];
+            }
+        }
         //签约店铺存在
         if($signStoreIds){
             $return = $this->getSignStoreClassesByStoreIds($signStoreIds,$gcId,$position);
@@ -759,8 +765,10 @@ class StoreServiceModel extends \Business\AbstractModel{
         /*if($signStoreIds&&$serviceStoreIds){
             $serviceStoreIds = array_diff($serviceStoreIds,$signStoreIds);
         }*/
-
-        //签约店铺存在
+        if(!$serviceStoreIds){
+            $serviceStoreIds = \Business\Goods\GoodsClassServiceModel::getInstance()->getServiceStoreIds($position);
+        }
+        //服务店铺存在
         if($serviceStoreIds){
             $return = $this->getStoreClassesByStoreIds($serviceStoreIds,$gcId);
             return $return;
@@ -802,9 +810,9 @@ class StoreServiceModel extends \Business\AbstractModel{
      * @return array|bool
      */
     public function getSignStoreClassesByStoreIds($signStoreIds,$gcId,$position){
-        $signStoreClassSql = ' store_id in ('.implode(',',$signStoreIds).') and is_charged=1  and class_style = 2 and gc_parent_id ='.$gcId;
+        $signStoreClassSql = ' store_id in ('.implode(',',$signStoreIds).') and gc_parent_id ='.$gcId;
         $qmStoreClassDao = \DAO\QmStoreClassModel::getInstance();
-        $signClassStores = $qmStoreClassDao->selectByWhere($signStoreClassSql,'store_id,gc_id,sign_scope');
+        $signClassStores = $qmStoreClassDao->getStoreSignClasses($signStoreClassSql,'store_id,gc_id,sign_scope');
         //$signClassStores = $storeGoodsClassDao->selectByWhere($signStoreClassSql,'store_id,gc_id');
         if($signClassStores){
             $return = array();

application/models/Business/User/MemberService.php

@@ -776,7 +776,7 @@ class MemberServiceModel extends \Business\AbstractModel
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::changeMobileFailed);
         }
         if($store){
-            $storeResult = $storeModel->save(array('store_phone'=>$data['mobile']),array('store_id'=>$store['store_id']));
+            $storeResult = $storeModel->save(array('store_phone'=>$data['mobile'],'seller_name'=>$data['mobile']),array('store_id'=>$store['store_id']));
             if($storeResult===false){
                 $memberDao->db->doRollback();
                 \Error\ErrorModel::throwException(\Error\CodeConfigModel::storePhoneUpdateFailed);

application/models/DAO/QmStoreClass.php

@@ -14,6 +14,8 @@ class QmStoreClassModel extends \DAO\AbstractModel{
      */
     protected $_tableName = 'han_qm_store_class';
 
+    protected $_tableNameSign = 'han_sign_store_class_view';
+
     /**
      * 主键
      *
@@ -99,6 +101,30 @@ class QmStoreClassModel extends \DAO\AbstractModel{
         return $result;
     }
 
+    public function getStoreSignClasses($where,$field = "*"){
+        $this->setDb();
+        if(is_array($where)){
+            $where = $this->db->getSqlWhereByArray($where);
+        }
+        $result = $this->db->select($field)->from($this->_tableNameSign)->where($where)->fetchAll();
+        return $result;
+    }
+
+
+    /**
+     * 删除签约店铺缓存
+     * @param $cityCode
+     * @throws \Our\Exception
+     */
+    public function delStoreSignClassesCache($cityCode=false,$storeId=false){
+        if($cityCode){
+            \Our\RedisHelper::delCachedFunction(\Redis\Db6\QmStoreClassRedisModel::getInstance(), array(&$this, 'getStoreSignClasses'),array(),array($cityCode));
+        }
+        if($storeId){
+            \Our\RedisHelper::delCachedFunction(\Redis\Db6\QmStoreClassRedisModel::getInstance(), array(&$this, 'getStoreSignClasses'),array(),array('store'.$storeId));
+        }
+    }
+
     /**
      * 删除签约店铺缓存
      * @param $cityCode