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

变更数据



查看合并请求 !3026

@@ -7,6 +7,7 @@
  */
  */
 namespace App\Http\Controllers\Api;
 namespace App\Http\Controllers\Api;
 
 
+use App\Enums\Common\Code;
 use App\Models\Geo\GeoConfirm;
 use App\Models\Geo\GeoConfirm;
 use App\Models\Geo\GeoWritings;
 use App\Models\Geo\GeoWritings;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
@@ -35,13 +36,15 @@ class GeoController extends BaseController
         } catch (\Exception $e) {
         } catch (\Exception $e) {
             return $this->error('非法请求');
             return $this->error('非法请求');
         }
         }
-        $project = Project::select('title', 'version')->where(['project_id' => $this->param['project_id']])->first();
-        $list = GeoWritings::select(['title', 'status', 'uniqid', 'confirm_at'])->where(['project_id' => $project_id, 'is_del' => GeoWritings::IS_DEL_FALSE])->get();
+        $projectModel = new Project();
+        $projectInfo = $projectModel->read(['project_id' => $project_id],['title','version']);
+        $geoWritingsModel = new GeoWritings();
+        $lists  = $geoWritingsModel->list(['project_id' => $project_id, 'is_del' => GeoWritings::IS_DEL_FALSE],'id',['title', 'status', 'uniqid', 'confirm_at']);
         $result = [
         $result = [
-            'project' => $project,
-            'list' => $list
+            'project' => $projectInfo,
+            'list' => $lists
         ];
         ];
-        return $this->success($result);
+        $this->response('success',Code::SUCCESS,$result);
     }
     }
 
 
     /**
     /**
@@ -49,11 +52,12 @@ class GeoController extends BaseController
      * @param Request $request
      * @param Request $request
      * @return false|string
      * @return false|string
      */
      */
-    public function getWritingsDetail(Request $request)
+    public function getWritingsDetail()
     {
     {
-        $token = trim($request->input('token'));
-        $detail = GeoWritings::select(['title', 'content', 'status'])->where(['uniqid' => $token])->first();
-        return $this->success($detail);
+        $geoWritingsModel = new GeoWritings();
+        $token = trim($this->param['token']);
+        $detail = $geoWritingsModel->read(['uniqid' => $token],['title', 'content', 'status']);
+        $this->response('success',Code::SUCCESS,$detail);
     }
     }
 
 
 
 
@@ -95,9 +99,9 @@ class GeoController extends BaseController
      * @param Request $request
      * @param Request $request
      * @return false|string
      * @return false|string
      */
      */
-    public function getConfirm(Request $request)
+    public function getConfirm()
     {
     {
-        $token = trim($request->input('token'));
+        $token = trim($this->param['token']);
         $data = GeoConfirm::where(['uniqid' => $token])->first();
         $data = GeoConfirm::where(['uniqid' => $token])->first();
         if (empty($data)){
         if (empty($data)){
             return $this->error('当前授权已失效');
             return $this->error('当前授权已失效');
@@ -107,7 +111,7 @@ class GeoController extends BaseController
         $type = $data->type;
         $type = $data->type;
         $status = $data->status;
         $status = $data->status;
         $result = compact('content', 'confirm', 'type', 'status');
         $result = compact('content', 'confirm', 'type', 'status');
-        return $this->success($result);
+        $this->response('success',Code::SUCCESS,$result);
     }
     }
 
 
     /**
     /**
@@ -115,6 +119,20 @@ class GeoController extends BaseController
      * 验证当前确认数据状态， 不可重复确认
      * 验证当前确认数据状态， 不可重复确认
      * @param Request $request
      * @param Request $request
      */
      */
-    public function saveConfirm(Request $request)
-    {}
+    public function saveConfirm()
+    {
+        $this->request->validate([
+            'uniqid' => 'required',
+            'confirm' => 'required',
+            'confirm_num' => 'required',
+        ], [
+            'uniqid.required' => '非法请求',
+            'confirm.required' => '客户确认内容不能为空',
+            'confirm_num.max' => '客户确认数量不能为空',
+        ]);
+        $geoConfirmModel = new GeoConfirm();
+        $this->param['status'] = $geoConfirmModel::STATUS_FINISH;
+        $result = $geoConfirmModel->edit($this->param,['uniqid'=>$this->param['uniqid']]);
+        $this->response('success',Code::SUCCESS,$result);
+    }
 }
 }

@@ -110,5 +110,8 @@ Route::prefix('ticket_upload')->group(function () {
 //geo设置
 //geo设置
 Route::prefix('geo')->group(function () {
 Route::prefix('geo')->group(function () {
     Route::any('/getConfirm', [\App\Http\Controllers\Api\GeoController::class, 'getConfirm'])->name('geo.getConfirm');
     Route::any('/getConfirm', [\App\Http\Controllers\Api\GeoController::class, 'getConfirm'])->name('geo.getConfirm');
+    Route::any('/getWritingsList', [\App\Http\Controllers\Api\GeoController::class, 'getWritingsList'])->name('geo.getWritingsList');//确认文章数据
+    Route::any('/getWritingsDetail', [\App\Http\Controllers\Api\GeoController::class, 'getWritingsDetail'])->name('geo.getWritingsDetail');//文章数据详情
+    Route::any('/saveConfirm', [\App\Http\Controllers\Api\GeoController::class, 'saveConfirm'])->name('geo.saveConfirm');//保存用户确认信息
 });
 });