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

application/models/Business/Goods/GoodsClassService.php

@@ -82,7 +82,6 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
         if($serviceStoreIds&&$signStoreIds){
             $serviceStoreIds = array_diff($serviceStoreIds,$signStoreIds);
         }
-
         $serviceParentClassIds = $this->getServiceStoreClasses($serviceStoreIds);
         if($serviceParentClassIds){
             $classIds = array_merge($serviceParentClassIds,$classIds);
@@ -215,14 +214,12 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
 
                 }
             }
-
             foreach($returnClass as $key => $class){
                 $classDistance[$key] = $class['class_distance'];
             }
             array_multisort($classDistance, SORT_DESC, $returnClass);
 
             $signParentClassIds = array_unique(array_column($returnClass,'gc_parent_id'));
-            //$signStoreIds = array_unique(array_column($returnClass,'store_id'));
             $signStoreIds = $newStoreIds;
 
             //将当前位置对应签约店铺存入缓存