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

变更数据



查看合并请求 !3074

@@ -27,7 +27,7 @@ class RemainDay extends Command
      * @var 按优化时间统计
      * @var 按优化时间统计
      */
      */
     protected $projectId = [
     protected $projectId = [
-        1434,1812,276,2414,2974,793
+        1434,1812,276,2414,2974,
     ];//需要单独处理的项目
     ];//需要单独处理的项目
 
 
     /**
     /**
@@ -37,7 +37,13 @@ class RemainDay extends Command
     protected $bm_projectId = [
     protected $bm_projectId = [
         4247,4299,4310,4215,4038,4084,4148,4178,4405
         4247,4299,4310,4215,4038,4084,4148,4178,4405
     ];
     ];
-
+    /**
+     * @var
+     * 优化项目，中途切换按服务时间长计时，单独计算
+     */
+    protected $projectSwitchId = [
+        793,
+    ];
 
 
     /**
     /**
      * @var 暂停的项目
      * @var 暂停的项目
@@ -85,8 +91,8 @@ class RemainDay extends Command
     public function saveRemainDay(){
     public function saveRemainDay(){
         $list = $this->project->list(['extend_type'=>Project::TYPE_ZERO,'type'=>['in',[Project::TYPE_TWO,Project::TYPE_THREE,Project::TYPE_FOUR,Project::TYPE_SIX]]],'id',['id','type','level','uptime','remain_day','is_remain_today','pause_days','finish_remain_day','bm_finish_remain_day']);
         $list = $this->project->list(['extend_type'=>Project::TYPE_ZERO,'type'=>['in',[Project::TYPE_TWO,Project::TYPE_THREE,Project::TYPE_FOUR,Project::TYPE_SIX]]],'id',['id','type','level','uptime','remain_day','is_remain_today','pause_days','finish_remain_day','bm_finish_remain_day']);
         foreach ($list as $item){
         foreach ($list as $item){
-            $deploy_build = $this->deployBuild->read(['project_id'=>$item['id']],['service_duration','seo_service_duration','plan','seo_plan']);
             echo 'start->项目id:' . $item['id'] . '执行时间：'. date('Y-m-d H:i:s') . PHP_EOL;
             echo 'start->项目id:' . $item['id'] . '执行时间：'. date('Y-m-d H:i:s') . PHP_EOL;
+            $deploy_build = $this->deployBuild->read(['project_id'=>$item['id']],['service_duration','seo_service_duration','plan','seo_plan']);
             if(in_array($item['id'],$this->ceaseProjectId)){//暂停的项目
             if(in_array($item['id'],$this->ceaseProjectId)){//暂停的项目
                 if(($item['type'] == Project::TYPE_TWO) && ($item['is_remain_today'] == 1)){
                 if(($item['type'] == Project::TYPE_TWO) && ($item['is_remain_today'] == 1)){
                     $pause_days = $item['pause_days'] + 1;
                     $pause_days = $item['pause_days'] + 1;
@@ -97,6 +103,11 @@ class RemainDay extends Command
                 $this->project->edit(['pause_days'=>$pause_days],['id'=>$item['id']]);
                 $this->project->edit(['pause_days'=>$pause_days],['id'=>$item['id']]);
                 continue;
                 continue;
             }
             }
+            //todo::优化项目中途达标计时切换为按天计时
+            if(in_array($item['id'],$this->projectSwitchId)){
+                $this->project->edit(['remain_day'=>$item['remain_day'] - 1,'finish_remain_day'=>$item['finish_remain_day'] + 1],['id'=>$item['id']]);
+                continue;
+            }
             //白帽版本单独计算
             //白帽版本单独计算
             $this->seoRemainDay($deploy_build,$item);
             $this->seoRemainDay($deploy_build,$item);
             //默认版本统计
             //默认版本统计

+<?php
+/**
+ * @remark :
+ * @name   :SettingFaqController.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/10/29 16:32
+ */
+
+namespace App\Http\Controllers\Bside\Setting;
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Bside\BaseController;
+use App\Http\Logic\Bside\Setting\SettingFaqLogic;
+use Illuminate\Http\Request;
+
+class SettingFaqController extends BaseController
+{
+
+    public function __construct(Request $request)
+    {
+        parent::__construct($request);
+        $this->logic = new SettingFaqLogic();
+    }
+
+    /**
+     * @remark :faq列表页数据
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/29 16:38
+     */
+    public function lists()
+    {
+       $lists = $this->logic->getFaqLists($this->map,$this->page,$this->row,$this->order);
+       $this->response('success',Code::SUCCESS,$lists);
+    }
+}

+<?php
+/**
+ * @remark :
+ * @name   :SettingFaqLogic.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/10/29 16:34
+ */
+
+namespace App\Http\Logic\Bside\Setting;
+
+use App\Http\Logic\Bside\BaseLogic;
+use App\Models\WebSetting\SettingFaq;
+
+class SettingFaqLogic extends BaseLogic
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new SettingFaq();
+        $this->param = $this->requestAll;
+    }
+
+    /**
+     * @remark :获取列表页数据
+     * @name   :getFaqLists
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/29 16:50
+     */
+    public function getFaqLists($map = [],$page = 1, $row = 10,$order = 'id')
+    {
+        $lists = $this->model->lists($map,$page,$row,$order);
+        return $this->success($lists);
+    }
+
+    /**
+     * @remark :保存数据
+     * @name   :saveFaq
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/29 16:50
+     */
+    public function saveFaq()
+    {
+
+        if(isset($this->param['id']) && !empty($this->param['id'])){
+            $id = $this->param['id'];
+            $this->model->edit($this->param,['id'=>$id]);
+        }else{
+            $id = $this->model->addReturnId($this->param);
+        }
+        return $this->success(['id' => $id]);
+    }
+}

+<?php
+/**
+ * @remark :
+ * @name   :SettingFaq.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/10/29 16:35
+ */
+
+namespace App\Models\WebSetting;
+
+use App\Models\Base;
+
+class SettingFaq extends Base
+{
+    protected $table = 'gl_setting_faq';
+}