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

app/Http/Controllers/V2/MemberGroupController.php

@@ -112,7 +112,7 @@ class MemberGroupController extends Controller {
     public function setIsSuggest(Request $request){
         $data = $request->only('id','is_suggest');
         $validator = Validator::make($data, [
-            'id' => 'required|string|max:20',
+            'id' => 'required|integer|max:20',
             'is_suggest' => ['required', Rule::in(0,1)],
         ]);
         if ($validator->fails()) {
@@ -124,7 +124,7 @@ class MemberGroupController extends Controller {
     public function setSort(Request $request){
         $data = $request->only('id','member_info');
         $validator = Validator::make($data, [
-            'id' => 'required|string|max:20',
+            'id' => 'required|integer|max:20',
             'member_info' => 'required',
         ]);
         if ($validator->fails()) {

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);
@@ -150,6 +150,12 @@ class MemberGroupRepository {
     //删除内容
     public function delete($id){
         $memberGroup = $this->memberGroup->where(['id'=>$id])->first();
+        if(!$memberGroup){
+            return Response::create([
+                'message'  => '该用户组不存在',
+                'status_code'   => 500
+            ]);
+        }
         if($memberGroup->is_suggest == 1){
             return Response::create([
                 'message'  => '该用户组推荐中无法删除，请关闭推荐后删除',

app/Transformers/DetailMemberGroupInfoTransformer.php

@@ -15,7 +15,7 @@ use Tymon\JWTAuth\Facades\JWTAuth;
 class DetailMemberGroupInfoTransformer extends TransformerAbstract{
     public function transform(MemberGroup $memberGroup)
     {
-
+        $memberList = [];
         foreach ($memberGroup->mgi as $key=>$value){
             $member = $this->getUser($value->uid);
             $value['uid'] = $member['uid'];

routes/api.php

@@ -115,43 +115,45 @@ $api->version('v1', [
             //关闭banner修改楼层状态
             $api->post('floorBind', 'FloorController@floorBind');
             //新增推荐话题
-            $api->post('TopicGroupCreate', 'TopicGroupController@create');
+            $api->post('topicGroup', 'TopicGroupController@create');
             //推荐话题组列表
-            $api->get('TopicGroupIndex', 'TopicGroupController@index');
+            $api->get('topicGroup', 'TopicGroupController@index');
             //推荐话题组编辑
-            $api->put('TopicGroupEdit', 'TopicGroupController@edit');
+            $api->put('topicGroup', 'TopicGroupController@edit');
             //详情
-            $api->get('TopicGroupView', 'TopicGroupController@view');
+            $api->get('topicGroup/view', 'TopicGroupController@view');
             //删除
-            $api->delete('TopicGroupDelete', 'TopicGroupController@delete');
+            $api->delete('topicGroup', 'TopicGroupController@delete');
             //新增视频组
-            $api->post('VideoGroupCreate', 'VideoGroupController@create');
+            $api->post('videoGroup', 'VideoGroupController@create');
             //视频组列表
-            $api->get('VideoGroupIndex', 'VideoGroupController@index');
+            $api->get('videoGroup', 'VideoGroupController@index');
             //视频组详情
-            $api->get('VideoGroupView', 'VideoGroupController@view');
+            $api->get('videoGroup/view', 'VideoGroupController@view');
             //修改
-            $api->put('VideoGroupEdit', 'VideoGroupController@edit');
+            $api->put('videoGroup', 'VideoGroupController@edit');
             //新增视频组内容
-            $api->post('VideoGroupAddVideoInfo', 'VideoGroupController@addVideoInfo');
+            $api->post('videoGroup/AddVideoInfo', 'VideoGroupController@addVideoInfo');
             //删除内容
-            $api->delete('VideoGroupDeleteVideoInfo', 'VideoGroupController@deleteVideoInfo');
+            $api->delete('videoGroup/DeleteVideoInfo', 'VideoGroupController@deleteVideoInfo');
             //删除分组
-            $api->delete('VideoGroupDelete', 'VideoGroupController@delete');
+            $api->delete('videoGroup', 'VideoGroupController@delete');
             //推荐用户列表
-            $api->get('MemberGroupIndex', 'MemberGroupController@index');
+            $api->get('memberGroup', 'MemberGroupController@index');
             //推荐用户详情
-            $api->get('MemberGroupView', 'MemberGroupController@view');
+            $api->get('memberGroup/view', 'MemberGroupController@view');
             //推荐用户添加
-            $api->post('MemberGroupCreate', 'MemberGroupController@create');
+            $api->post('memberGroup', 'MemberGroupController@create');
             //推荐用户修改
-            $api->put('MemberGroupEdit', 'MemberGroupController@edit');
+            $api->put('memberGroup', 'MemberGroupController@edit');
             //推荐用户删除
-            $api->delete('MemberGroupDelete', 'MemberGroupController@delete');
+            $api->delete('memberGroup', 'MemberGroupController@delete');
+            //删除用户组内容
+            $api->delete('memberGroup/DeleteMemberInfo', 'MemberGroupController@deleteMemberInfo');
             //设置推荐
-            $api->put('MemberGroupSetIsSuggest', 'MemberGroupController@setIsSuggest');
+            $api->put('memberGroup/SetIsSuggest', 'MemberGroupController@setIsSuggest');
             //设置内容排序
-            $api->put('MemberGroupSetInfoSort', 'MemberGroupController@setSort');
+            $api->put('memberGroup/SetInfoSort', 'MemberGroupController@setSort');
 
         });