合并分支 'master-server' 到 'master'

更新不需要分类Master server 查看合并请求 !662

合并分支 'master-server' 到 'master'
更新不需要分类Master server 查看合并请求 !662
李宇航
app/Console/Kernel.php
app/Helper/helper.php
app/Http/Controllers/Bside/Product/ProductController.php
app/Http/Logic/Aside/BaseLogic.php
app/Http/Logic/Bside/BaseLogic.php
app/Http/Logic/Bside/Product/ProductLogic.php
app/Models/Base.php
routes/bside.php
--- a/app/Console/Kernel.php
查看文件 @b92051c
+++ b/app/Console/Kernel.php
查看文件 @b92051c
@@ -21,14 +21,6 @@ class Kernel extends ConsoleKernel
         // $schedule->command('inspire')->hourly();
         $schedule->command('remain_day')->dailyAt('09:00')->withoutOverlapping(1); // 项目剩余服务时长
         $schedule->command('rank_data_task')->everyMinute()->withoutOverlapping(1); // 排名数据更新任务
-//        $schedule->command('rank_data')->dailyAt('07:00')->withoutOverlapping(1); // 排名数据，每天凌晨执行一次
-//        $schedule->command('rank_data')->dailyAt('08:00')->withoutOverlapping(1); // 排名数据，每天凌晨执行一次
-//        $schedule->command('rank_data_speed')->dailyAt('01:10')->withoutOverlapping(1); // 排名数据-测速数据，每周一凌晨执行一次
-//        $schedule->command('rank_data_external_links')->dailyAt('08:30')->withoutOverlapping(1); // 排名数据-外链，每周一凌晨执行一次
-//        $schedule->command('rank_data_external_links')->dailyAt('18:00')->withoutOverlapping(1); // 排名数据-外链，每周一凌晨执行一次
-//        $schedule->command('rank_data_indexed_pages')->dailyAt('07:30')->withoutOverlapping(1); // 排名数据-页面收录，每周一凌晨执行一次
-//        $schedule->command('rank_data_recomm_domain')->dailyAt('07:40')->withoutOverlapping(1); // 排名数据-引荐域名，每周一凌晨执行一次
-//        $schedule->command('rank_data_week')->weeklyOn([1,2], '08:30')->withoutOverlapping(1); // 排名数据，每周一、二早上执行一次
         $schedule->command('service_count')->dailyAt('01:00')->withoutOverlapping(1); //服务器使用情况，每天凌晨1点执行一次
         $schedule->command('web_traffic_special')->everyMinute()->withoutOverlapping(1); // 特殊引流
         $schedule->command('web_traffic_russia_special')->everyMinute()->withoutOverlapping(1); // 特殊引流
@@ -43,8 +35,6 @@ class Kernel extends ConsoleKernel
         $schedule->command('update_keyword_route')->dailyAt('01:00')->withoutOverlapping(1); //升级项目--清除路由相同的关键字
         $schedule->command('recommended_suppliers')->dailyAt('03:00')->withoutOverlapping(1); //每天凌晨1点执行一次生成推荐商
         $schedule->command('update_keyword_content')->hourly()->withoutOverlapping(1);
-        // 每日推送视频任务
-//        $schedule->command('video_task')->hourly()->withoutOverlapping(1);
         // 每日推送已完成视频任务项目生成对应界面
         $schedule->command('notice_c')->dailyAt('04:00')->withoutOverlapping(1);
     }
--- a/app/Helper/helper.php
查看文件 @b92051c
+++ b/app/Helper/helper.php
查看文件 @b92051c
@@ -215,6 +215,26 @@ if (!function_exists('_get_child')) {
     }
 }
+if (!function_exists('_get_all_sub')) {
+    /**
+     * 獲取所有子集id
+     * @param int
+     * @return array
+     */
+    function _get_all_sub($my_id,$id_Arr)
+    {
+        $new_arr = array();
+        foreach ($id_Arr as $v) {
+            if ($v['pid'] == $my_id) {
+                $new_arr[] = $v['id'];
+                // 递归查找子节点的子节点
+                $new_arr = array_merge($new_arr, _get_all_sub($v['id'], $id_Arr));
+            }
+        }
+        return $new_arr ? $new_arr : [];
+    }
+}
+
 if (!function_exists('checkDomain')) {
     /**
--- a/app/Http/Controllers/Bside/Product/ProductController.php
查看文件 @b92051c
+++ b/app/Http/Controllers/Bside/Product/ProductController.php
查看文件 @b92051c
@@ -422,6 +422,11 @@ class ProductController extends BaseController
      * @time   :2023/8/21 18:33
      */
     public function getStatusNumber(ProductLogic $logic){
+        $this->request->validate([
+            'featured_status'=>'numeric',
+        ],[
+            'featured_status.numeric' => 'numeric为数字',
+        ]);
         $data = $logic->getStatusNumber();
         $this->response('success',Code::SUCCESS,$data);
     }
@@ -536,10 +541,9 @@ class ProductController extends BaseController
         $setNumModel = new SettingNum();
         $info = $setNumModel->read(['type'=>$setNumModel::TYPE_PRODUCT_SORT]);
         if($info === false){
-            $info = [];
-        }else{
-            $info['data'] = json_decode($info['data']);
+            $this->response('success');
         }
+        $info['data'] = json_decode($info['data']);
         $this->response('success',Code::SUCCESS,$info);
     }
@@ -580,4 +584,21 @@ class ProductController extends BaseController
         }
         $this->response('success',Code::SUCCESS,$productInfo);
     }
+
+    /**
+     * @remark :搜索分类参数
+     * @name   :searchCategory
+     * @author :lyh
+     * @method :post
+     * @time   :2024/7/9 14:48
+     */
+    public function getSearchCategoryList(ProductLogic $logic){
+        $this->request->validate([
+            'featured_status'=>'numeric',
+        ],[
+            'featured_status.numeric' => 'numeric为数字',
+        ]);
+        $data = $logic->getSearchCategoryList();
+        $this->response('success',Code::SUCCESS,$data);
+    }
 }
--- a/app/Http/Logic/Aside/BaseLogic.php
查看文件 @b92051c
+++ b/app/Http/Logic/Aside/BaseLogic.php
查看文件 @b92051c
@@ -41,7 +41,7 @@ class BaseLogic extends Logic
             if(is_array($v)){
                 continue;
             }else{
-                if(empty($v) && ($v == null)){
+                if($v == null){
                     unset($requestAll[$k]);
                 }
             }
--- a/app/Http/Logic/Bside/BaseLogic.php
查看文件 @b92051c
+++ b/app/Http/Logic/Bside/BaseLogic.php
查看文件 @b92051c
@@ -210,4 +210,5 @@ class BaseLogic extends Logic
         ];
         return http_post($c_url, json_encode($param));
     }
+
 }
--- a/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @b92051c
+++ b/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @b92051c
@@ -334,22 +334,6 @@ class ProductLogic extends  BaseLogic
     /**
-     * @remark :编辑产品
-     * @name   :editProduct
-     * @author :lyh
-     * @method :post
-     * @time   :2023/9/7 10:02
-     */
-    public function editProductRoute($id,$route){
-        $info = $this->model->read(['id'=>$id]);
-        if($info['route'] != $route){
-            $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT,$route);
-        }
-        $this->curlDelRoute(['route'=>$info['route'],'new_route'=>$route]);
-        return $route;
-    }
-
-    /**
      * @remark :删除数据
      * @name   :delete
      * @author :lyh
@@ -406,13 +390,32 @@ class ProductLogic extends  BaseLogic
      * @time   :2023/8/9 10:17
      */
     public function getStatusNumber(){
+        $map = [];
         //三种状态 0：草稿 1：发布 2：回收站
         $data = ['dra'=>0,'pub'=>1,'del'=>2,'tal'=>3];
         foreach ($data as $k => $v){
+            //查詢所有分類
+            $cateModel = new Category();
+            $cateList = $cateModel->list(['status'=>1],'id',['id','pid']);
+            $this->param['featured_status']  = $this->param['featured_status'] ?? 0;
+            if(!empty($cateList) && ($this->param['featured_status'] != $cateModel::STATUS_ACTIVE)){
+                $featured_ids = $cateModel->where('title', 'like', '%Featured%')->pluck('id')->toArray();
+                //获取当前的子集
+                $featured_arr = [];
+                foreach ($featured_ids as $id){
+                    $featured_arr = array_values(array_unique(_get_all_sub($id,$cateList)));
+                }
+                if(!empty($featured_arr)){
+                    $cateRelated = new CategoryRelated();
+                    $product_ids = $cateRelated->whereNotIn('cate_id',$featured_arr)->pluck('product_id')->unique()->toArray();
+                    $map['id'] = ['in',$product_ids];
+                }
+            }
             if($v == 3){
-                $data[$k] = $this->model->where(['project_id'=>$this->user['project_id']])->count();
+                $data[$k] = $this->model->formatQuery($map)->count();
             }else{
-                $data[$k] = $this->model->where(['status'=>$v,'project_id'=>$this->user['project_id']])->count();
+                $map['status'] = $v;
+                $data[$k] = $this->model->formatQuery($map)->count();
             }
         }
         return $this->success($data);
@@ -847,4 +850,34 @@ class ProductLogic extends  BaseLogic
         }
         return false;
     }
+
+    /**
+     * @remark :产品列表搜索参数时分类列表
+     * @param  :
+     * @name   :getSearchCategoryList
+     * @author :lyh
+     * @method :post
+     * @time   :2024/7/9 14:56
+     */
+    public function getSearchCategoryList()
+    {
+        $categoryModel = new Category();
+        $this->param['deleted_at'] = null;
+        $this->param['featured_status']  = $this->param['featured_status'] ?? 0;
+        if(($this->param['featured_status'] != Category::STATUS_ACTIVE)) {
+            $this->param['title'] = ['not like','%Featured%'];
+        }
+        $list = $categoryModel->list($this->param, ['sort', 'id'], ['id', 'pid', 'title']);
+        if (!empty($list)) {
+            $data = [];
+            foreach ($list as $v) {
+                $v = (array)$v;
+                if ($v['pid'] == 0) {
+                    $v['sub'] = _get_child($v['id'], $list);
+                    $data[] = $v;
+                }
+            }
+        }
+        return $this->success($data);
+    }
 }
--- a/app/Models/Base.php
查看文件 @b92051c
+++ b/app/Models/Base.php
查看文件 @b92051c
@@ -175,18 +175,21 @@ class Base extends Model
                             $query->where($k, $v[0], $v[1]);
                         }
                         break;
+                    case 'not like':
+                        $query->where($k, $v[0], $v[1]);
+                        break;
                     case 'in':
                         // in查询 ['id'=>['in',[1,2,3]]]
                         $query->whereIn($k, $v[1]);
                         break;
-                    case 'or':
-                        // in查询 ['id'=>['or',[1,2,3]]]
-                        $query->orWhere($k, $v[1]);
-                        break;
                     case 'not in':
                         // in查询 ['id'=>['not in',[1,2,3]]]
                         $query->whereNotIn($k, $v[1]);
                         break;
+                    case 'or':
+                        // in查询 ['id'=>['or',[1,2,3]]]
+                        $query->orWhere($k, $v[1]);
+                        break;
                     case 'between':
                         // in查询 ['id'=>['between',[create1,create2]]]
                         $query->whereBetween($k, $v[1]);
--- a/routes/bside.php
查看文件 @b92051c
+++ b/routes/bside.php
查看文件 @b92051c
@@ -255,6 +255,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/copyProduct', [\App\Http\Controllers\Bside\Product\ProductController::class, 'copyProduct'])->name('product_copyProduct');
         Route::any('/batchSetCategory', [\App\Http\Controllers\Bside\Product\ProductController::class, 'batchSetCategory'])->name('product_batchSetCategory');
         Route::any('/sendAiProduct', [\App\Http\Controllers\Bside\Product\ProductController::class, 'sendAiProduct'])->name('product_sendAiProduct');
+        Route::any('/getSearchCategoryList', [\App\Http\Controllers\Bside\Product\ProductController::class, 'getSearchCategoryList'])->name('product_getSearchCategoryList');
         //产品分类
         Route::get('category', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'index'])->name('product_category');
         Route::get('category/info', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'info'])->name('product_category_info');