修复精彩生活分类

app/common/repositories/store/product/ProductRepository.php

@@ -800,6 +800,26 @@ class ProductRepository extends BaseRepository
 
         $where = array_merge($where, $this->dao->productShow());
 
+        $cateList = [];
+        if($where['cate_id']){
+            $cate_name = Db::name('store_category')->where('pid', 564)->where('store_category_id', $where['cate_id'])->value('cate_name');
+            $url = "https://dc-api.gdjbp.com/douhuomallCategory/getCateAll";
+            $result = curlGet($url);
+            if (!isset($result['status']) || $result['status'] != 200) {
+                $cateList = [$where['cate_id']];
+            }else{
+                $cateIds = [];
+                foreach($result['data'] as $item){
+                    if($item['cateName'] == $cate_name){
+                        $cateIds = explode(",", $item['cateIds']);
+                        break;
+                    }
+                }
+                $cateList = array_merge([$where['cate_id']], $cateIds);
+            }
+            unset($where['cate_id']);
+        }
+
         //搜索记录
         if ($userInfo && isset($where['keyword']) && !empty($where['keyword'])){
             log::info("======sousuojilu====");
@@ -819,6 +839,12 @@ class ProductRepository extends BaseRepository
             });
         }
 
+        if(count($cateList) > 0){
+            $query->where(function ($query2) use ($cateList) {
+                $query2->whereIn('cate_id', $cateList)->whereOr("cate_id is null");
+            });
+        }
+
         $count = $query->count($this->dao->getPk());
 //        echo DB::getlastsql();die;
         $list = $query->page($page, $limit)->setOption('field', [])->field($this->filed)->select();