Merge branch 'develop' of ssh://git.9026.com:2212/swdz-WangHaijun/BaoMa into develop

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

@@ -63,7 +63,8 @@ class CommonController extends Controller
                 'avatar' => $req['avatar'] ?? '',
                 'latitude' => $req['latitude'] ?? 0,
                 'longitude' => $req['longitude'] ?? 0,
-                'session_key' => $session_key
+                'session_key' => $session_key,
+                'is_docter' => 1
             ]);
         }
         else {
@@ -450,7 +451,7 @@ class CommonController extends Controller
             return out(null, 10001, '文件不能为空');
         }
 
-        $path = $file->store('uploads/'.date('Ymd'));
+        $path = $file->store('upload/docter/'.date('Ymd'));
 //        $url = request()->getScheme().'://'.request()->getHost().'/'.$path;
 
         return out(['url' => $path]);

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

@@ -561,6 +561,7 @@ class DoctorController extends AuthController
         $finds = Docter::select(['is_chat', 'is_phone', 'is_appoint'])->where('id', $doctor_id)->first();
         $flag = false;
 
+
         Db::beginTransaction();
         try {
             if ($finds['is_appoint'] == 0) {
@@ -632,6 +633,7 @@ class DoctorController extends AuthController
                         }
 
                     }
+
                     if($times_data&&$setting_data){
                         foreach ($times_data as $k => $v) {
                             TimePeriod::insert($v);
@@ -1286,19 +1288,21 @@ class DoctorController extends AuthController
         $fuw_order = Order::with('orderPack')->where($ws)->orderBy('created_at', 'desc')->get();
         if ($fuw_order) {
             $fuw_order = $fuw_order->toArray();
+//            var_dump($fuw_order);
 
             foreach ($fuw_order as $kk => $vv) {
                 $fuwArr[$kk]['order_id'] = $vv['id'];
                 if ($vv['order_pack']) {
-                    foreach ($vv['order_pack'] as $k => $v) {
-                        $fuwArr[$kk]['id'] = $v['id'];
-                        $fuwArr[$kk]['pack_name'] = $v['pack_name'];
-                        $fuwArr[$kk]['pack_intro'] = $v['pack_intro'];
-                        $fuwArr[$kk]['pack_price'] = $v['pack_price'];
-                        $fuwArr[$kk]['effective_days'] = $v['effective_days'];
-                        $fuwArr[$kk]['start_time'] = date('Y-m-d,H:i', $v['start_time']);
-                        $fuwArr[$kk]['end_time'] = date('Y-m-d,H:i', $v['end_time']);
-                    }
+
+//                    foreach ($vv['order_pack'] as $k => $v) {
+                    $fuwArr[$kk]['id'] = $vv['order_pack']['id'];
+                    $fuwArr[$kk]['pack_name'] = $vv['order_pack']['pack_name'];
+                    $fuwArr[$kk]['pack_intro'] = $vv['order_pack']['pack_intro'];
+                    $fuwArr[$kk]['pack_price'] = $vv['order_pack']['pack_price'];
+                    $fuwArr[$kk]['effective_days'] = $vv['order_pack']['effective_days'];
+                    $fuwArr[$kk]['start_time'] = date('Y-m-d,H:i', $vv['order_pack']['start_time']);
+                    $fuwArr[$kk]['end_time'] = date('Y-m-d,H:i', $vv['order_pack']['end_time']);
+//                    }
                 }
 
             }
@@ -2362,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'];
@@ -2388,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);
     }