Merge branch 'develop' of http://git.caihongxingqiu.net/rainbow/cms-manage into develop

app/Http/Controllers/V2/FloorController.php

@@ -52,6 +52,14 @@ class FloorController extends BaseController
     //新建楼层
     public function create(Request $request)
     {
+        $validator = Validator::make($request->all(), [
+            'name' => 'required|string',
+            'floor_location' => 'required|integer',
+        ]);
+
+        if ($validator->fails()) {
+            return $this->response->error($validator->errors()->first(), 500);
+        }
         return  $this->floorRepository->create($request->all());
 
     }
@@ -61,7 +69,7 @@ class FloorController extends BaseController
     public function edit(Request $request)
     {
         $validator = Validator::make($request->all(), [
-            'id' => 'required|exists:operate_floor_management',
+            'id' => 'required|exists:cms_floor',
             'name' => 'required|string',
             'floor_location' => 'required|integer',
             'group_ids' => 'required',
@@ -80,7 +88,7 @@ class FloorController extends BaseController
     public function editStatus(Request $request)
     {
         $validator = Validator::make($request->all(), [
-            'id' => 'required|exists:operate_floor_management',
+            'id' => 'required|exists:cms_floor',
             'is_open' => ['required', Rule::in(0,1)],
         ]);
 

app/Repositories/V2/FloorRepository.php

@@ -21,9 +21,13 @@ class FloorRepository
         $this->floor = $floor;
     }
 
-    public function index()
+    public function index($request)
     {
-        return $this->floor->paginate(20);
+        $where = [];
+        if(isset($request['id'])){
+            $where[] = ['id', '=', $request['id']];
+        }
+        return $this->floor->where($where)->orderBy('id', 'asc')->paginate(20);
     }
 
     public function create($request)
@@ -90,10 +94,8 @@ class FloorRepository
 
     public function floorBind($request)
     {
-        Log::debug(json_encode($request));
         $banner_id = $request['banner_id'];
         $floor_array = $this->floor->select('id','group_ids')->where('floor_type',0)->get();
-        Log::debug(json_encode($floor_array));
         $floor_ids = [];
         foreach ($floor_array->toArray() as $value){
             if ($banner_id == $value['group_ids']){
@@ -101,7 +103,6 @@ class FloorRepository
             }
         }
         if (count($floor_ids)>0){
-            Log::debug($floor_ids);
             $edit_floor = $this->floor->whereIn('id',$floor_ids)->update(['is_open'=>0]);
             if (!$edit_floor){
                 throw new HttpException(500, '该楼层关闭失败');

app/Repositories/V2/MemberGroupRepository.php

@@ -71,8 +71,8 @@ class MemberGroupRepository {
                     foreach($member_ids as $value){
                         $member_data[] = [
                             'member_group_id' => $res->id,
-                            'uid' => $value->id,
-                            'sort' => $value->sort,
+                            'uid' => $value['id'],
+                            'sort' => $value['sort'],
                         ];
                     }
                     $this->memberGroupInfo->insert($member_data);
@@ -129,8 +129,8 @@ class MemberGroupRepository {
                 foreach($member_ids as $value){
                     $member_data[] = [
                         'member_group_id' => $memberGroup->id,
-                        'uid' => $value->id,
-                        'sort' => $value->sort,
+                        'uid' => $value['id'],
+                        'sort' => $value['sort'],
                     ];
                 }
                 $this->memberGroupInfo->insert($member_data);