修复会话

app/Http/Controllers/Api/V2/DoctorController.php

@@ -2366,12 +2366,13 @@ class DoctorController extends AuthController
         $where[] = ['docter_id', $doctor_id];
         $list = Order::with('user')->where($where)->orderBy('receiving_time', 'desc')->get();
         $newList = [];
+        $isflag = [];
         if ($list) {
             $list = $list->toArray();
             foreach ($list as $k => $v) {
                 $messages = ImMessage::where(['senderId'=>'doctor_'.$doctor_id,'receiverId'=>'member_'.$v['user_id']])->orWhere(function ($query) use ($req,$doctor_id,$v){
                     $query->where(['senderId'=>'member_'.$v['user_id'],'receiverId'=>'doctor_'.$doctor_id]);
-                })->orderBy('id','desc')->first();
+                })->orderBy('id','asc')->first();
                 if($messages){
                     if($messages['type']=='text'){
                         $newList[$v['user_id']]['out_message'] = $messages['payload'];
@@ -2392,12 +2393,21 @@ class DoctorController extends AuthController
                 }
 
                 $newList[$v['user_id']]['flag'] = 'member_' . $v['user_id'];
+                $newList[$v['user_id']]['user_id'] = $v['user_id'];
+                if ($v['order_status']==3){
+                    $isflag[$k] =$v['user_id'];
+                }
                 $newList[$v['user_id']]['order_status'] = $v['order_status'];
                 $newList[$v['user_id']]['nickname'] = $v['user']['nickname'];
                 $newList[$v['user_id']]['avatar'] = $v['user']['avatar'];
                 $newList[$v['user_id']]['remark'] = !empty($v['user']['remark'])?$v['user']['remark']:'';
             }
             $newList = array_values($newList);
+            foreach ($newList as $k=>$v){
+                if (in_array($v['user_id'],$isflag)){
+                    $newList[$k]['order_status'] = 3;
+                }
+            }
         }
         return out($newList);
     }