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

Lyh server



查看合并请求 !3091

@@ -71,4 +71,26 @@ class GeoConfirmController extends BaseController
         $data = $this->logic->saveConfirmContent($this->param);
         $this->response('success', Code::SUCCESS, $data);
     }
+
+    /**
+     * @remark :保存确认信息
+     * @name   :saveInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/30 11:30
+     */
+    public function saveInfo()
+    {
+        $this->request->validate([
+            'id' => 'required',
+            'confirm' => 'required',
+            'confirm_num' => 'required',
+        ], [
+            'id.required' => '主键id不能为空',
+            'confirm.required' => '客户确认内容不能为空',
+            'confirm_num.max' => '客户确认数量不能为空',
+        ]);
+        $data = $this->logic->saveConfirmInfo();
+        $this->response('success', Code::SUCCESS, $data);
+    }
 }

@@ -68,6 +68,24 @@ class GeoConfirmLogic extends BaseLogic
     public function getConfirmInfo()
     {
         $data = $this->model->read($this->param);
+        if($data === false){
+            $this->fail('当前数据不存在或者已被删除');
+        }
+        $data['confirm'] = $data['content'];
         return $this->success($data);
     }
+
+    /**
+     * @remark :保存确认信息
+     * @name   :saveConfirmInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/30 11:41
+     */
+    public function saveConfirmInfo()
+    {
+        $this->param['status'] = GeoConfirm::STATUS_FINISH;
+        $this->model->edit($this->param,['id'=>$this->param['id']]);
+        return $this->success(['id'=>$this->param['id']]);
+    }
 }

@@ -597,6 +597,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::prefix('confirm')->group(function () {
             Route::any('/saveConfirmContent', [Aside\Geo\GeoConfirmController::class, 'saveConfirmContent'])->name('admin.geo_confirm_saveConfirmContent');
             Route::any('/getInfo', [Aside\Geo\GeoConfirmController::class, 'getInfo'])->name('admin.geo_confirm_getInfo');
+            Route::any('/saveInfo', [Aside\Geo\GeoConfirmController::class, 'saveInfo'])->name('admin.geo_confirm_saveInfo');
         });
         //geoai文章任务管理
         Route::prefix('writing_task')->group(function () {