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

Lyh server



查看合并请求 !3076

@@ -105,7 +105,7 @@ class RemainDay extends Command
             }
             }
             //todo::优化项目中途达标计时切换为按天计时
             //todo::优化项目中途达标计时切换为按天计时
             if(in_array($item['id'],$this->projectSwitchId)){
             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']]);
+                $this->project->edit(['remain_day'=>($item['remain_day'] - 1),'finish_remain_day'=>($item['finish_remain_day'] + 1)],['id'=>$item['id']]);
                 continue;
                 continue;
             }
             }
             //白帽版本单独计算
             //白帽版本单独计算

@@ -35,4 +35,40 @@ class SettingFaqController extends BaseController
        $lists = $this->logic->getFaqLists($this->map,$this->page,$this->row,$this->order);
        $lists = $this->logic->getFaqLists($this->map,$this->page,$this->row,$this->order);
        $this->response('success',Code::SUCCESS,$lists);
        $this->response('success',Code::SUCCESS,$lists);
     }
     }
+
+    /**
+     * @remark :保存faq数据
+     * @name   :saveFaq
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/29 17:21
+     */
+    public function saveFaq()
+    {
+        $this->request->validate([
+            'route'=>'required',
+        ],[
+            'route.required' => '路由不能为空',
+        ]);
+        $data = $this->logic->saveFaq();
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
+     * @remark :删除对应数据
+     * @name   :deleteFaq
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/29 17:23
+     */
+    public function deleteFaq(){
+        $this->request->validate([
+            'id'=>'required|array',
+        ],[
+            'id.required' => 'ID不能为空',
+            'id.array' => 'ID为数组',
+        ]);
+        $data = $this->logic->deleteFaq();
+        $this->response('success',Code::SUCCESS,$data);
+    }
 }
 }

@@ -10,6 +10,7 @@
 namespace App\Http\Logic\Bside\Setting;
 namespace App\Http\Logic\Bside\Setting;
 
 
 use App\Http\Logic\Bside\BaseLogic;
 use App\Http\Logic\Bside\BaseLogic;
+use App\Models\RouteMap\RouteMap;
 use App\Models\WebSetting\SettingFaq;
 use App\Models\WebSetting\SettingFaq;
 
 
 class SettingFaqLogic extends BaseLogic
 class SettingFaqLogic extends BaseLogic
@@ -43,7 +44,15 @@ class SettingFaqLogic extends BaseLogic
      */
      */
     public function saveFaq()
     public function saveFaq()
     {
     {
-
+        //todo::根据路由获取对应数据详情
+        $routeModel = new RouteMap();
+        $routeInfo = $routeModel->read(['route'=>$this->param['route']],['source','source_id']);
+        if($routeInfo === false){
+            $this->fail('路由不存在');
+        }
+        $this->param['qa'] = json_encode($this->param['qa'],true);
+        $this->param['source'] = $routeInfo['source'];
+        $this->param['source_id'] = $routeInfo['source_id'];
         if(isset($this->param['id']) && !empty($this->param['id'])){
         if(isset($this->param['id']) && !empty($this->param['id'])){
             $id = $this->param['id'];
             $id = $this->param['id'];
             $this->model->edit($this->param,['id'=>$id]);
             $this->model->edit($this->param,['id'=>$id]);
@@ -52,4 +61,16 @@ class SettingFaqLogic extends BaseLogic
         }
         }
         return $this->success(['id' => $id]);
         return $this->success(['id' => $id]);
     }
     }
+
+    /**
+     * @remark :删除数据
+     * @name   :deleteFaq
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/29 17:27
+     */
+    public function deleteFaq(){
+        $this->model->del(['id'=>['in',$this->param['id']]]);
+        return $this->success();
+    }
 }
 }

@@ -768,6 +768,13 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/getSearchDate', [\App\Http\Controllers\Bside\Geo\GeoQuestionResController::class, 'getSearchDate'])->name('geo_result_getSearchDate');//搜索记录时间
         Route::any('/getSearchDate', [\App\Http\Controllers\Bside\Geo\GeoQuestionResController::class, 'getSearchDate'])->name('geo_result_getSearchDate');//搜索记录时间
         Route::any('/getPlatformCount', [\App\Http\Controllers\Bside\Geo\GeoQuestionResController::class, 'getPlatformCount'])->name('geo_result_getPlatformCount');//搜索记录时间
         Route::any('/getPlatformCount', [\App\Http\Controllers\Bside\Geo\GeoQuestionResController::class, 'getPlatformCount'])->name('geo_result_getPlatformCount');//搜索记录时间
     });
     });
+
+    //faq渲染数据
+    Route::prefix('faq')->group(function () {
+        Route::any('/', [\App\Http\Controllers\Bside\Setting\SettingFaqController::class,'lists'])->name('faq_lists');
+        Route::any('/saveFaq', [\App\Http\Controllers\Bside\Setting\SettingFaqController::class,'saveFaq'])->name('faq_saveFaq');
+        Route::any('/deleteFaq', [\App\Http\Controllers\Bside\Setting\SettingFaqController::class,'deleteFaq'])->name('faq_deleteFaq');
+    });
 });
 });
 //无需登录验证的路由组
 //无需登录验证的路由组
 Route::group([], function () {
 Route::group([], function () {