Explorar el Código

Merge branch 'liuzj-permission-dev' into test

liuzejian hace 1 año
padre
commit
9743c580d6
Se han modificado 1 ficheros con 4 adiciones y 2 borrados
  1. 4 2
      modules/Jiesuan/Http/Controllers/FinanceCheckController.php

+ 4 - 2
modules/Jiesuan/Http/Controllers/FinanceCheckController.php

@@ -68,7 +68,8 @@ class FinanceCheckController extends CatchController
     public function check(Request $request) {
         $this->validate($request, [
             'status' => 'required|in:2,3',
-            'id' => 'required'
+            'id' => 'required',
+            'remark' => 'nullable|string|max:140'
         ]);
         $record = DB::table('tixian_records')
             ->where([
@@ -85,7 +86,8 @@ class FinanceCheckController extends CatchController
                 'status' => 1
             ])->update([
                 'status' => $request->input('status'),
-                'updated_at' => date('Y-m-d H:i:s')
+                'updated_at' => date('Y-m-d H:i:s'),
+                'remark' => $request->input('remark', ''),
             ]);
         $after = CompanyUserMoneyService::userMoneyInfo($record->company_uid);
         if(2 == $request->input('status')) {