Merge branch 'master' of http://git.sotype.com/chenxiqiang/houseworking

manage-server/app/Http/Controllers/MaternityMatronOrderController.php

@@ -98,4 +98,29 @@ class MaternityMatronOrderController extends Controller
         $data->appends(["keyword" => $keyword]);
         return $data;
     }
+
+    /**
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function remark(Request $request)
+    {
+        $remark = $request->input('remark');
+        $id = $request->input('id');
+        if($id && $remark) {
+            $record = MaternityMatronOrder::find($id);
+            $record->remark = $remark;
+            $record->save();
+            return Response()->json([
+                "status" => 0,
+                "message" => "保存成功!",
+                "data" => $record
+            ]);
+        } else {
+            return Response()->json([
+                "status" => -1,
+                "message" => "信息不能为空!"
+            ]);
+        }
+    }
 }

manage-server/app/Http/Controllers/OptionOrderController.php

@@ -92,16 +92,42 @@ class OptionOrderController extends Controller
     {
         $keyword = $request->input('keyword');
         if($keyword) {
-            $data = MaternityMatronOrder::where("notes", "like",  "%{$keyword}%")
+            $data = OptionOrder::where("notes", "like",  "%{$keyword}%")
                 ->orWhere("contact", "like",  "%{$keyword}%")
                 ->orWhere("classify", "like",  "%{$keyword}%")
                 ->orWhere("phone", "like",  "%{$keyword}%")
                 ->orWhere("remark", "like",  "%{$keyword}%")
                 ->paginate();
         } else {
-            $data = MaternityMatronOrder::paginate();
+            $data = OptionOrder::paginate();
         }
         $data->appends(["keyword" => $keyword]);
         return $data;
     }
+
+
+    /**
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function remark(Request $request)
+    {
+        $remark = $request->input('remark');
+        $id = $request->input('id');
+        if($id && $remark) {
+            $record = OptionOrder::find($id);
+            $record->remark = $remark;
+            $record->save();
+            return Response()->json([
+                "status" => 0,
+                "message" => "保存成功!",
+                "data" => $record
+            ]);
+        } else {
+            return Response()->json([
+                "status" => -1,
+                "message" => "信息不能为空!"
+            ]);
+        }
+    }
 }

manage-server/app/Http/Controllers/ProductOrderController.php

@@ -98,4 +98,28 @@ class ProductOrderController extends Controller
         return $data;
     }
 
+    /**
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function remark(Request $request)
+    {
+        $remark = $request->input('remark');
+        $id = $request->input('id');
+        if($id && $remark) {
+            $record = ProductOrder::find($id);
+            $record->info = $remark;
+            $record->save();
+            return Response()->json([
+                "status" => 0,
+                "message" => "保存成功!",
+                "data" => $record
+            ]);
+        } else {
+            return Response()->json([
+                "status" => -1,
+                "message" => "信息不能为空!"
+            ]);
+        }
+    }
 }

manage-server/routes/web.php

@@ -26,6 +26,10 @@ Route::post('/upload', 'CommonController@upload');
 
 Route::middleware(['manage.token'])->group(function () {
 
+    Route::post('/maternity_matron_order/remark', 'MaternityMatronOrderController@remark');
+    Route::post('/product_order/remark', 'ProductOrderController@remark');
+    Route::post('/option_order/remark', 'OptionOrderController@remark');
+
     Route::post('/reward/price', 'RewardController@price');
     Route::get('/reward/price', 'RewardController@getPrice');
     Route::get('/classify/parent', 'ClassifyController@parent');