Merge remote-tracking branch 'origin/master' into akun

@@ -20,6 +20,7 @@ use App\Models\Project\ProjectAiSetting;
 use App\Models\Project\ProjectWhiteHatAffix;
 use App\Models\Project\ProjectWhiteHatAffix;
 use App\Models\Template\BTemplateMain;
 use App\Models\Template\BTemplateMain;
 use App\Models\Template\TemplateTypeMain;
 use App\Models\Template\TemplateTypeMain;
+use App\Models\WebSetting\WebSetting;
 use App\Services\AiBlogService;
 use App\Services\AiBlogService;
 use App\Services\Geo\GeoService;
 use App\Services\Geo\GeoService;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
@@ -43,7 +44,25 @@ class lyhDemo extends Command
     protected $description = '更新路由';
     protected $description = '更新路由';
 
 
     public function handle(){
     public function handle(){
-        return $this->_actionRoute();
+        $projectModel = new Project();
+        $lists = $projectModel->list(['delete_status' => 0,'project_type'=>0,'id'=>3659,'extend_type'=>0,'type'=>['in',[1,2,3,4,6]]], 'id', ['id']);
+        foreach ($lists as $val){
+            echo date('Y-m-d H:i:s') . '开始--项目的id:'. $val['id'] . PHP_EOL;
+            ProjectServer::useProject($val['id']);
+            $settingModel = new WebSetting();
+            $info = $settingModel->read(['project_id'=>$val['id']]);
+            if($info === false){
+                echo '跳过当前数据'.PHP_EOL;
+                continue;
+            }
+            if(empty($info['anchor_setting'])){
+                $settingModel->edit(['anchor_setting'=>["5","3","4"]],['project_id'=>$val['id']]);
+            }else{
+                echo '已有数据'.PHP_EOL;
+            }
+            DB::disconnect('custom_mysql');
+            echo date('Y-m-d H:i:s') . '结束--项目的id:'. $val['id'] . PHP_EOL;
+        }
     }
     }
 
 
     /**
     /**

@@ -215,7 +215,13 @@ class FetchTicketProjects extends Command
                     $pm_id = ManageHr::where('status', 1)->find($item->deploy_build->manager_mid)->manage_id ?? ManageHr::where('status', 1)->where('name', '李洁玉')->value('manage_id') ?? 0;
                     $pm_id = ManageHr::where('status', 1)->find($item->deploy_build->manager_mid)->manage_id ?? ManageHr::where('status', 1)->where('name', '李洁玉')->value('manage_id') ?? 0;
 
 
                     // 第一负责人
                     // 第一负责人
-                    if ($status == 1)
+                    /**
+                     * 5.0升级6.0的项目,白帽SEO的项目 都划给售后
+                     * 其他：建站中找项目经理，建站完成找杨长远，推广找售后服务经理
+                     */
+                    if ($item->is_upgrade || $item->project_type == 1)
+                        $engineer_id = $assm_id; // V5升V6，白帽SEO，找售后服务经理
+                    elseif ($status == 1)
                         $engineer_id = $pm_id; // 建站中找项目经理
                         $engineer_id = $pm_id; // 建站中找项目经理
                     elseif ($status == 2)
                     elseif ($status == 2)
                         $engineer_id = Manage::where('status', 1)->where('name', '杨长远')->value('id') ?? 0; // 建站完成找杨长远
                         $engineer_id = Manage::where('status', 1)->where('name', '杨长远')->value('id') ?? 0; // 建站完成找杨长远

@@ -28,6 +28,7 @@ class AsideTicketController extends BaseController
         $lists = Tickets::with([
         $lists = Tickets::with([
             'logs.engineer',
             'logs.engineer',
             'project.pm',
             'project.pm',
+            'project.projectV6',
         ])
         ])
             ->when(!empty($validated['engineer_id']), function ($query) use ($validated) {
             ->when(!empty($validated['engineer_id']), function ($query) use ($validated) {
                 // 查 gl_tickets 表 submit_user_id 或 gl_ticket_logs 表 engineer_id
                 // 查 gl_tickets 表 submit_user_id 或 gl_ticket_logs 表 engineer_id

@@ -40,7 +40,7 @@ class CategoryController extends BaseController
     public function index()
     public function index()
     {
     {
         $this->map = $this->searchParam();
         $this->map = $this->searchParam();
-        $filed = ['id', 'project_id', 'pid', 'title', 'image', 'route', 'status','created_at','sort'];
+        $filed = ['id', 'project_id', 'pid', 'title', 'image', 'route', 'status','created_at','sort','is_type'];
         $this->map['deleted_at'] = null;
         $this->map['deleted_at'] = null;
         if($this->user['project_id'] == 3283){//分类太多加载失败
         if($this->user['project_id'] == 3283){//分类太多加载失败
             $list = $this->get3283Lists($filed);
             $list = $this->get3283Lists($filed);
@@ -260,4 +260,23 @@ class CategoryController extends BaseController
         $this->logic->copyCategoryInfo();
         $this->logic->copyCategoryInfo();
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * @remark :更改状态
+     * @name   :editIsType
+     * @author :lyh
+     * @method :post
+     * @time   :2025/7/30 14:23
+     */
+    public function editIsType(){
+        $this->request->validate([
+            'id'=>['required'],
+            'is_type'=>['required'],
+        ],[
+            'id.required' => 'ID不能为空',
+            'is_type.required' => 'is_type不能为空',
+        ]);
+        $data = $this->logic->editIsType($this->param['is_type'],$this->param['id']);
+        $this->response('success',Code::SUCCESS,$data);
+    }
 }
 }

@@ -361,4 +361,16 @@ class CategoryLogic extends  BaseLogic
         ];
         ];
         return $this->success($param);
         return $this->success($param);
     }
     }
+
+    /**
+     * @remark :更改分类为聚合页模式
+     * @name   :editIsType
+     * @author :lyh
+     * @method :post
+     * @time   :2025/7/30 14:21
+     */
+    public function editIsType($is_type = 0,$id){
+        $data = $this->model->edit(['is_type'=>$is_type],['id'=>$id]);
+        return $this->success($data);
+    }
 }
 }

@@ -68,7 +68,7 @@ class WebSettingTextLogic extends BaseLogic
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {
             $data = [
             $data = [
-                'anchor_setting'=>$this->param['anchor_setting'] ?? [],
+                'anchor_setting'=>$this->param['anchor_setting'] ?? ["5","3","4"],
                 'anchor_is_enable'=>$this->param['anchor_is_enable'],
                 'anchor_is_enable'=>$this->param['anchor_is_enable'],
                 'anchor_num'=>$this->param['anchor_num'] ?? 0,
                 'anchor_num'=>$this->param['anchor_num'] ?? 0,
                 'anchor_page_num'=>$this->param['anchor_page_num'] ?? 0,
                 'anchor_page_num'=>$this->param['anchor_page_num'] ?? 0,

@@ -19,7 +19,7 @@ class TicketProject extends Base
     public function projectV6()
     public function projectV6()
     {
     {
         return $this->hasOne(Project::class, 'id', 'table_id')
         return $this->hasOne(Project::class, 'id', 'table_id')
-            ->where('version', 6);
+            ->select(['id', 'title', 'company', 'is_upgrade', 'project_type']);
     }
     }
 
 
     // 项目经理
     // 项目经理

@@ -304,6 +304,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::post('category/sort', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'sort'])->name('product_category_sort');
         Route::post('category/sort', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'sort'])->name('product_category_sort');
         Route::any('category/delete', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'delete'])->name('product_category_delete');
         Route::any('category/delete', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'delete'])->name('product_category_delete');
         Route::any('category/allSort', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'allSort'])->name('product_category_allSort');
         Route::any('category/allSort', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'allSort'])->name('product_category_allSort');
+        Route::any('category/editIsType', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'editIsType'])->name('product_category_editIsType');//列表页聚合页设置
         Route::any('category/copyCategory', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'copyCategory'])->name('product_category_copyCategory');
         Route::any('category/copyCategory', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'copyCategory'])->name('product_category_copyCategory');
         //产品关键词
         //产品关键词
         Route::get('keyword', [\App\Http\Controllers\Bside\Product\KeywordController::class, 'index'])->name('product_keyword');
         Route::get('keyword', [\App\Http\Controllers\Bside\Product\KeywordController::class, 'index'])->name('product_keyword');