add

server/app/Http/Controllers/Api/V1/IndexController.php

@@ -26,7 +26,9 @@ class IndexController extends Controller
      *"message": "",
      *"data": {
      *      "banner": [],  轮播图
-     *      "other_user": [],  动态用户
+     *      "other_user": [          动态用户
+     *                    'news_num':2    新消息数目
+     * ],
      *      "dreams": [
      *         "care_num": 0,   关注人数
      *         "time": 1222222,   梦想倒计时
@@ -60,6 +62,7 @@ class IndexController extends Controller
         $other_user = [] ;
         foreach ($arr as $k => $v){
             if ($v->pivot->dream_num > 0) {
+                $v->news_num = $v->pivot->dream_num;
                 $other_user[] = $v;
             }
         }
@@ -82,7 +85,9 @@ class IndexController extends Controller
      *"status_code": 0,
      *"message": "",
      *"data": {
-     *      "other_user": [],  动态用户
+     *      "other_user": [   动态用户
+     *               'news_num':2    新消息数目
+     * ],
      *      "dreams": [
      *         "care_num": 0,   关注人数
      *         "time": 1222222,   梦想倒计时
@@ -114,6 +119,7 @@ class IndexController extends Controller
         $other_user = [] ;
         foreach ($arr as $k => $v){
             if ($v->pivot->dream_num > 0) {
+                $v->news_num = $v->pivot->dream_num;
                 $other_user[] = $v;
             }
         }
@@ -136,7 +142,9 @@ class IndexController extends Controller
      *"status_code": 0,
      *"message": "",
      *"data": {
-     *      "other_user": [],  动态用户
+     *      "other_user": [
+     *          'news_num':2    新消息数目
+     * ],  动态用户
      *      "dreams": [
      *         "care_num": 0,   关注人数
      *         "time": 1222222,   梦想倒计时
@@ -168,6 +176,7 @@ class IndexController extends Controller
         $other_user = [] ;
         foreach ($arr as $k => $v){
             if ($v->pivot->dream_num > 0) {
+                $v->news_num = $v->pivot->dream_num;
                 $other_user[] = $v;
             }
         }
@@ -352,4 +361,61 @@ class IndexController extends Controller
             $dream->dream_first_pic =  $dream->dreamImgsFirst;
         }
     }
+//    查看关注用户的最新动态
+    /**
+     * @api {get}  /api/index/news_info 关注用户动态详情
+     * @apiDescription 关注用户动态详情
+     * @apiGroup Index
+     * @apiPermission none
+     * @apiVersion 0.1.0
+     * @apiParam {int}  id   被点击用户ID
+     * @apiSuccessExample {json} Success-Response:
+     * HTTP/1.1 200 OK
+    {
+        "status": true,
+        "status_code": 0,
+        "message": "",
+        "data": [
+            {
+                "id": 12,
+                "dream": "123",
+                "about": "124",
+                "sign": null,
+                "videos": "234",
+                "money": 2345,
+                "time": 0,       倒计时 s
+                "get_money": 0,
+                "mark": 0,
+                "status": 0,
+                "score": 3,
+                "created_at": "2017-06-15 08:46:52",
+                "updated_at": "2017-06-15 08:46:52",
+                "deleted_at": null,
+                "imgs": [
+                    {
+                        "id": 8,
+                        "dream_id": 12,
+                        "title": "",
+                        "pic": "....png",   梦想图片
+                    },
+                ],
+            }
+        ]
+    }
+     * @apiErrorExample {json} Error-Response:
+     * HTTP/1.1 400 Bad Request
+     */
+    public function newsInfo(Request $request)
+    {
+//        查看后user_care_user dream_info 更新为零 首页不再显示
+        $user = $this->getUser();
+        $other_id = $request->id;
+        if (empty($other_id))  return $this->error(ErrorCode::MEMBER_NOT_EXIST);
+        UserCareUser::where('user_id',$user->id)->where('other_user_id',$other_id)->update(['dream_num'=>0]);
+        $data = UserInfoModel::find($other_id)->UserDream;
+        foreach ($data as $item) {
+            $item->imgs =  $item->dreamImgs ;
+        }
+        return $this->api($data);
+    }
 }

server/app/Http/Controllers/Api/V1/MyController.php

@@ -7,7 +7,9 @@ use App\Models\BaseSettingsModel;
 use App\Models\DreamImages;
 use App\Models\DreamInfoModel;
 use App\Models\ReplyCommentsInfo;
+use App\Models\UserCareUser;
 use App\Models\UserDream;
+use App\Models\UserInfoModel;
 use Illuminate\Http\Request;
 use App\Services\Base\ErrorCode;
 class MyController extends Controller
@@ -119,376 +121,90 @@ class MyController extends Controller
     }
 
     /**
-     * @api {post} /api/my/nickname 修改昵称(nickname)
-     * @apiDescription 修改昵称(nickname)
+     * @api {get} /api/my/edit_user_info 修改个人信息
+     * @apiDescription 修改个人信息
      * @apiGroup My
-     * @apiParam {string} nickname 昵称
+     * @apiParam {int} id   登录用户ID
      * @apiPermission Passport
      * @apiVersion 0.1.0
      * @apiSuccessExample {json} Success-Response:
      * HTTP/1.1 200 OK
-     * {
-     *   " status": true,
-     *   "status_code": 0,
-     *   "message": "",
-     *   "data": ""
-    *}
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     * {
-     *   "status": false,
-     *   "status_code": 600,
-     *   "message": "保存用户数据失败",
-     *   "data": null
-     *  }
-     */
-    public function nickname(Request $request)
-    {
-        $user = $this->getUser();
-
-        $validator = \Validator::make($request->all(),
-            [
-                'nickname'  => 'required',
-            ],
-            [
-                'nickname.required'  => '昵称不能为空',
-            ]
-        );
-
-        if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
-
-        $nickname = $request->nickname;
-        $user->nickname = $nickname;
-        $ok = $user->save();
-
-        if ($ok) return $this->api('');
-        return $this->error(ErrorCode::SAVE_USER_FAILED);
-    }
-
-    /**
-     * @api {post} /api/my/sex 修改性别(sex get or post)
-     * @apiDescription 修改性别(sex)
-     * @apiGroup My
-     * @apiParam {sex} sex 性别
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *   get
      *{
-     *   "status": true,
-     *   "status_code": 0,
-     *   "message": "",
-     *   "data": [
-     *       {
-     *           "value": "0",
-     *           "name": "男"
-     *       },
-     *       {
-     *          "value": "1",
-     *          "name": "女"
-     *       }
-     *    ]
-     *}
-     * post
-     * {
-     *   " status": true,
-     *   "status_code": 0,
-     *   "message": "",
-     *   "data": ""
-     *}
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     * {
-     *   "status": false,
-     *   "status_code": 600,
-     *   "message": "保存用户数据失败",
-     *   "data": null
-     *  }
-     */
-    public function sex(Request $request)
-    {
-        if ($request->method() == 'GET') {
-            $data = BaseDictionaryOptionModel::where('dictionary_table_code','user_info')->
-                where('dictionary_code','sex')->get();
-            return $this->api($data);
-        }
-        $user = $this->getUser();
-
-        $validator = \Validator::make($request->all(),
-            [
-                'sex'  => 'required',
-            ],
-            [
-                'sex.required'  => '性别不能为空',
-            ]
-        );
-
-        if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
-
-        $sex = $request->sex;
-        $user->sex = $sex;
-        $ok = $user->save();
-
-        if ($ok) return $this->api('');
-        return $this->error(ErrorCode::SAVE_USER_FAILED);
-    }
-
-    /**
-     * @api {post} /api/my/signture 个性签名(signture)
-     * @apiDescription 个性签名(signture)
-     * @apiGroup My
-     * @apiParam {string} signture 个性签名
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     * {
-     *   " status": true,
-     *   "status_code": 0,
-     *   "message": "",
-     *   "data": ""
-     *}
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     * 保存
-     * {
-     *   "status": false,
-     *   "status_code": 600,
-     *   "message": "保存用户数据失败",
-     *   "data": null
-     *  }
-     * 提交
-     * {
-     *  "status": false,
-     *  "status_code": 1000,
-     *   "message": "个性签名不能为空",
-     *   "data": null
-     *}
-     */
-    public function signture(Request $request)
-    {
-        $user = $this->getUser();
-
-        $validator = \Validator::make($request->all(),
-            [
-                'signture'  => 'required',
-            ],
-            [
-                'signture.required'  => '个性签名不能为空',
-            ]
-        );
-
-        if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
-
-        $signture = $request->signture;
-        $user->signture = $signture;
-        $ok = $user->save();
-
-        if ($ok) return $this->api('');
-        return $this->error(ErrorCode::SAVE_USER_FAILED);
-    }
-
-    /**
-     * @api {post} /api/my/tel 修改手机号(tel)
-     * @apiDescription 修改手机号(tel)
-     * @apiGroup My
-     * @apiParam {int} tel 修改手机号
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     * {
-     *   " status": true,
+     *  "status": true,
      *   "status_code": 0,
      *   "message": "",
-     *   "data": ""
-     *}
+     *   "data": {
+     *       "emotion": [
+     *          {
+     *              "value": "1",
+     *              "name": "未婚"
+     *          },
+     *          ...
+     *      ],
+     *      "sex": [
+     *          {
+     *              "value": "0",
+     *              "name": "男"
+     *           },
+     *          ...
+     *      ]
+     *   }
+     * }
      * @apiErrorExample {json} Error-Response:
      * HTTP/1.1 400 Bad Request
      * {
      *   "status": false,
-     *   "status_code": 600,
-     *   "message": "保存用户数据失败",
+     *   "status_code": 1500,
+     *   "message": "会员不存在",
      *   "data": null
      *  }
      */
-    public function tel(Request $request)
+    public function  editUserInfo (Request $request)
     {
-        $user = $this->getUser();
+        if (empty($request->id))  return $this->error(ErrorCode::MEMBER_NOT_EXIST) ;
 
-        $validator = \Validator::make($request->all(),
-            [
-                'tel'  => 'required|regex:/^1[34578][0-9]{9}$/',
-            ],
-            [
-                'tel.required'  => '手机号不能为空',
-                'tel.regex'  => '手机号格式不正确',
-            ]
-        );
-
-        if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
+        $sex = BaseDictionaryOptionModel::where('dictionary_table_code','user_info')->
+             where('dictionary_code','sex')->get();
+        $emotion = BaseDictionaryOptionModel::where('dictionary_table_code','user_info')->
+             where('dictionary_code','emotion')->get();
 
-        $tel = $request->tel;
-        $user->tel = $tel;
-        $ok = $user->save();
+        return $this->api(compact('emotion','sex'));
 
-        if ($ok) return $this->api('');
-        return $this->error(ErrorCode::SAVE_USER_FAILED);
     }
 
     /**
-     * @api {post} /api/my/job 工作类型(job  get or post)
-     * @apiDescription 工作类型(job)
+     * @api {post} /api/my/edit_user_info 保存个人信息
+     * @apiDescription   保存个人信息
      * @apiGroup My
-     * @apiParam {string} job 工作类型
      * @apiPermission Passport
      * @apiVersion 0.1.0
      * @apiSuccessExample {json} Success-Response:
      * HTTP/1.1 200 OK
-     * {
-     *   " status": true,
-     *   "status_code": 0,
+     *{
+     *    "status": true,
+     *    "status_code": 0,
      *   "message": "",
      *   "data": ""
      *}
      * @apiErrorExample {json} Error-Response:
      * HTTP/1.1 400 Bad Request
-     * {
+     *{
      *   "status": false,
      *   "status_code": 600,
      *   "message": "保存用户数据失败",
      *   "data": null
-     *  }
+     * }
      */
-    public function job(Request $request)
+    public function updateUserInfo(Request $request)
     {
-        if ($request->method() == 'GET') {
-            $data = BaseDictionaryOptionModel::where('dictionary_table_code','user_info')->
-            where('dictionary_code','job')->get();
-            return $this->api($data);
-        }
-
         $user = $this->getUser();
-
-        $validator = \Validator::make($request->all(),
-            [
-                'job'  => 'required',
-            ],
-            [
-                'job.required'  => '工作类型不能为空',
-            ]
-        );
-
-        if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
-
-        $job = $request->job;
-        $user->job = $job;
-        $ok = $user->save();
-
-        if ($ok) return $this->api('');
-        return $this->error(ErrorCode::SAVE_USER_FAILED);
-    }
-
-    /**
-     * @api {post} /api/my/job 情感状态(emotion  get or post)
-     * @apiDescription 情感状态(job)
-     * @apiGroup My
-     * @apiParam {int} emotion 情感状态
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     * {
-     *   " status": true,
-     *   "status_code": 0,
-     *   "message": "",
-     *   "data": ""
-     *}
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     * {
-     *   "status": false,
-     *   "status_code": 600,
-     *   "message": "保存用户数据失败",
-     *   "data": null
-     *  }
-     */
-    public function emotion(Request $request)
-    {
-        if ($request->method() == 'GET') {
-            $data = BaseDictionaryOptionModel::where('dictionary_table_code','user_info')->
-            where('dictionary_code','emotion')->get();
-            return $this->api($data);
+        $data = $request->except('_token');
+        $ok =  $user->update($data);
+        if ($ok) {
+            return $this->api('');
+        }else{
+            return $this->error(ErrorCode::SAVE_USER_FAILED);
         }
-
-        $user = $this->getUser();
-
-        $validator = \Validator::make($request->all(),
-            [
-                'emotion'  => 'required',
-            ],
-            [
-                'emotion.required'  => '情感状态不能为空',
-            ]
-        );
-
-        if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
-
-        $emotion = $request->emotion;
-        $user->emotion = $emotion;
-        $ok = $user->save();
-
-        if ($ok) return $this->api('');
-        return $this->error(ErrorCode::SAVE_USER_FAILED);
-    }
-
-    /**
-     * @api {post} /api/my/tall 身高
-     * @apiDescription 身高
-     * @apiGroup My
-     * @apiParam {int} tall 身高
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     * {
-     *   " status": true,
-     *   "status_code": 0,
-     *   "message": "",
-     *   "data": ""
-     *}
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     * {
-     *   "status": false,
-     *   "status_code": 600,
-     *   "message": "保存用户数据失败",
-     *   "data": null
-     *  }
-     */
-    public function tall(Request $request)
-    {
-        $user = $this->getUser();
-
-        $validator = \Validator::make($request->all(),
-            [
-                'tall'  => 'required|integer',
-            ],
-            [
-                'tall.required'  => '身高不能为空',
-                'tall.integer'  => '身高只能填写数字',
-            ]
-        );
-
-        if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
-
-        $tall = $request->tall;
-        $user->tall = $tall;
-        $ok = $user->save();
-
-        if ($ok) return $this->api('');
-        return $this->error(ErrorCode::SAVE_USER_FAILED);
     }
 
     /**
@@ -804,6 +520,14 @@ class MyController extends Controller
         $dream_id = DreamInfoModel::insertGetId($data);
 
         if ($dream_id) {
+//            梦想创建成功 关联关系中最新动态+1
+            $info = UserCareUser::where('other_user_id',$user->id)->get();
+            foreach ($info as $item) {
+                $item->dream_num += 1;
+                $item->updated_at = date('Y-m-d H:i:s');
+                $item->save();
+            }
+
             $data1['dream_id'] = $dream_id;
             $data1['user_id'] = $user->id;
             $data1['created_at'] = date('Y-m-d H:i:s');

server/routes/api.php

@@ -108,6 +108,10 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
         'as' => 'index.dream_search',
         'uses' => 'IndexController@dreamSearch',
     ]);
+    $api->get('index/news_info', [
+        'as' => 'index.news_info',
+        'uses' => 'IndexController@newsInfo',
+    ]);
 
 //我的
     $api->get('my/index', [
@@ -118,33 +122,13 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
         'as' => 'my.persona',
         'uses' => 'MyController@persona',
     ]);
-    $api->post('my/nickname', [
-        'as' => 'my.nickname',
-        'uses' => 'MyController@nickname',
-    ]);
-    $api->any('my/sex', [
-        'as' => 'my.sex',
-        'uses' => 'MyController@sex',
-    ]);
-    $api->post('my/signture', [
-        'as' => 'my.signture',
-        'uses' => 'MyController@signture',
-    ]);
-    $api->post('my/tel', [
-        'as' => 'my.tel',
-        'uses' => 'MyController@tel',
-    ]);
-    $api->any('my/job', [
-        'as' => 'my.job',
-        'uses' => 'MyController@job',
-    ]);
-    $api->any('my/emotion', [
-        'as' => 'my.emotion',
-        'uses' => 'MyController@emotion',
+    $api->get('my/edit_user_info', [
+        'as' => 'my.edit_user_info',
+        'uses' => 'MyController@editUserInfo',
     ]);
-    $api->post('my/tall', [
-        'as' => 'my.tall',
-        'uses' => 'MyController@tall',
+    $api->post('my/update_user_info', [
+        'as' => 'my.update_user_info',
+        'uses' => 'MyController@updateUserInfo',
     ]);
 //    充值
     $api->get('my/recharge', [