Skip to content

M
my-yaf-project
Commit 16a5296d authored by chenchuanwen's avatar chenchuanwen
Browse files
Options

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

parents 415e4c93 57ee6f45
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
application/models/Business/Goods/GoodsClassService.php
View file @ 16a5296d
...@@ -82,7 +82,6 @@ class GoodsClassServiceModel extends \Business\AbstractModel{ ...@@ -82,7 +82,6 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
if($serviceStoreIds&&$signStoreIds){ if($serviceStoreIds&&$signStoreIds){
$serviceStoreIds = array_diff($serviceStoreIds,$signStoreIds); $serviceStoreIds = array_diff($serviceStoreIds,$signStoreIds);
} }
$serviceParentClassIds = $this->getServiceStoreClasses($serviceStoreIds); $serviceParentClassIds = $this->getServiceStoreClasses($serviceStoreIds);
if($serviceParentClassIds){ if($serviceParentClassIds){
$classIds = array_merge($serviceParentClassIds,$classIds); $classIds = array_merge($serviceParentClassIds,$classIds);
...@@ -215,14 +214,12 @@ class GoodsClassServiceModel extends \Business\AbstractModel{ ...@@ -215,14 +214,12 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
} }
} }
foreach($returnClass as $key => $class){ foreach($returnClass as $key => $class){
$classDistance[$key] = $class['class_distance']; $classDistance[$key] = $class['class_distance'];
} }
array_multisort($classDistance, SORT_DESC, $returnClass); array_multisort($classDistance, SORT_DESC, $returnClass);
$signParentClassIds = array_unique(array_column($returnClass,'gc_parent_id')); $signParentClassIds = array_unique(array_column($returnClass,'gc_parent_id'));
//$signStoreIds = array_unique(array_column($returnClass,'store_id'));
$signStoreIds = $newStoreIds; $signStoreIds = $newStoreIds;
//将当前位置对应签约店铺存入缓存 //将当前位置对应签约店铺存入缓存
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment