m

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

@@ -219,7 +219,9 @@ class DreamController extends Controller
             if(count($top3user) <= 2) $top3user[] = $user ;
         }
         if ($type == 'paihang') return $this->api($topuser);
-        $interactions = InteractionInfo::where('dream_id',$id)->with('comments')->orderBy('id','desc')->get();
+        $interactions = InteractionInfo::where('dream_id',$id)->with(['comments' => function ($query) {
+            $query->orderBy('created_at');
+        }])->orderBy('id','desc')->get();
         /*dd($interactions);
         foreach ($interactions as $item) {
             $item->comments;
@@ -258,7 +260,7 @@ class DreamController extends Controller
         $dream->show_button = $show_button;
 //        梦想互动
         $interactions = InteractionInfo::where('dream_id',$id)->with(['comments' => function ($query) {
-            $query->orderBy('created_at','desc');
+            $query->orderBy('created_at');
         }])->orderBy('created_at','desc')->get();
         $dream->interactions = $interactions;
 //        dd($interactions);

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

@@ -122,12 +122,24 @@ class InteractionController extends Controller
         if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
 
         $user = $this->getUser();
-        $user_id = $user->id;
+       /* $user_id = $user->id;
         $user_avatar = $user->avatar;
         $user_nickname = $user->nickname;
         $interaction_id = $request->id;
         $content = $request->content;
-        $data = compact('user_id','user_avatar','user_nickname','interaction_id','content');
+        $is_read = 1;
+        $data = compact('user_id','user_avatar','user_nickname','interaction_id','content','is_read');*/
+
+        $data['to_user_id'] = InteractionInfo::find($request->id)->dream->user_id;
+        $data['to_user_avatar'] = InteractionInfo::find($request->id)->dream->user_avatar;
+        $data['to_user_nickname'] = InteractionInfo::find($request->id)->dream->user_nickname;
+
+        $data['user_id'] = $user->id;
+        $data['user_avatar'] =$user->avatar;
+        $data['user_nickname'] = $user->nickname;
+        $data['interaction_id'] = $request->interaction_id;
+        $data['content'] = $request->content;
+        $data['is_read'] = 1;
         $ok = CommentInfoModel::create($data);
         if ($ok) {
             return $this->api('');
@@ -181,14 +193,20 @@ class InteractionController extends Controller
         if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
 
         $user = $this->getUser();
-        $data['to_user_id'] = $user->id;
-//        $data['to_user_avatar'] = $user->avatar;
-        $data['to_user_nickname'] = $user->nickname;
-        $data['user_id'] =CommentInfoModel::find($request->id)->user_id;
-        $data['user_avatar'] =CommentInfoModel::find($request->id)->user_avatar;
-        $data['user_nickname'] =CommentInfoModel::find($request->id)->user_nickname;
+      /*  $data['to_user_id'] = $user->id;
+        $data['to_user_avatar'] = $user->avatar;
+        $data['to_user_nickname'] = $user->nickname; */
+
+//        $data['to_user_id'] = CommentInfoModel::find($request->id)->user_id;
+        $data['to_user_avatar'] = CommentInfoModel::find($request->id)->user_avatar;
+        $data['to_user_nickname'] = CommentInfoModel::find($request->id)->user_nickname;
+
+        $data['user_id'] = $user->id;
+        $data['user_avatar'] =$user->avatar;
+        $data['user_nickname'] = $user->nickname;
         $data['interaction_id'] = $request->interaction_id;
         $data['content'] = $request->content;
+        $data['is_read'] = 1;
 
         if (!$request->content)
             return $this->error(ErrorCode::CONNET_NOT_EXIST);

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

@@ -251,7 +251,7 @@ class MyController extends Controller
     public function reply()
     {
         $user = $this->getUser();
-        $data = CommentInfoModel::where('user_id',$user->id)->orderBy('id','desc')->get();
+        $data = CommentInfoModel::where('to_user_id',$user->id)->orderBy('id','desc')->get(); //user_id
 
         foreach ($data as $item){   //访问接口  标记已读
             $item->update(['is_read'=>1]);
@@ -354,8 +354,8 @@ class MyController extends Controller
         $letter1 =  SystemInfoModel::where('user_id',$user->id)->whereNotNull('to_user_id')->orderBy('id','desc')->get();
         $letter2 =  SystemInfoModel::where('user_id',$user->id)->where('is_read','0')
             ->whereNotNull('to_user_id')->orderBy('id','desc')->get();
-        $comments1 = CommentInfoModel::where('user_id',$user->id)->orderBy('id','desc')->get();
-        $comments2 = CommentInfoModel::where('user_id',$user->id)->where('is_read','0')->orderBy('id','desc')->get();
+        $comments1 = CommentInfoModel::where('to_user_id',$user->id)->orderBy('id','desc')->get();
+        $comments2 = CommentInfoModel::where('to_user_id',$user->id)->where('is_read','0')->orderBy('id','desc')->get();
         $arr = [];
         $arr['systemInfo']['number'] = count($systemInfo1) ;
         $arr['systemInfo']['is_read'] = count($systemInfo2) ;