订单详情接口返回数据调整

app/common/repositories/movie/MovieRepository.php

@@ -198,7 +198,7 @@ class MovieRepository extends BaseRepository
 
             $_order = [
                 'uid' => $userinfo->uid,
-                'mobile' => $userinfo->phone,
+                'mobile' => $params['phone'] ?? $userinfo->phone,
                 'order_sn' => $order_sn,
                 'plat_order' => $submitOrder['data']['plat_order'],
                 'price' => $order_price,
@@ -359,17 +359,31 @@ class MovieRepository extends BaseRepository
         $result = DouHuoMallFilmApiRequest::getOrderInfo($order_sn);
         if (!empty($result) && ($result['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE)) {
             $plat_orderinfo = $result['data'];
-            $plat_orderinfo['order_sn'] = $plat_orderinfo['third_order'];
-            $plat_orderinfo['sched_seat'] = base64_encode(json_encode($plat_orderinfo['sched_seat'], JSON_FORCE_OBJECT));
             $plat_orderinfo['order_price'] = $orderinfo['order_price'];
+            $plat_orderinfo['order_sn'] = $order_sn;
+            $plat_orderinfo['create_time'] = strtotime($orderinfo['create_time']);
+            $plat_orderinfo['phone'] = $orderinfo['phone'];
             $plat_orderinfo['sched_seat'] = json_decode($orderinfo['sched_seat'], true);
-            $plat_orderinfo['cinema_film'] = Db::name('movie_cinema_sched')
-                ->where('film_sign', $orderinfo['film_sign'])
-                ->where(['relation_id' => $orderinfo['relation_id'], 'sched_sign' => $orderinfo['sched_sign']])
-                ->field('cinema_sign,cinema_name,address,longitude,latitude,hall_sign,hall_name,film_sign,film_name,show_date,show_time')
-                ->find();
-            $plat_orderinfo['cinema_film']['show_date'] = date('Y-m-d', $plat_orderinfo['cinema_film']['show_date']);
-            $plat_orderinfo['cinema_film']['cover_img'] = Db::name('movie_film')->where('film_sign', $orderinfo['film_sign'])->value('cover_img');
+            $plat_orderinfo['cinema'] = [
+                'cinema_sign' => $orderinfo['cinema_sign'],
+                'cinema_name' => $orderinfo['cinema_name'],
+                'address' => $orderinfo['address'],
+                'longitude' => $orderinfo['longitude'],
+                'latitude' => $orderinfo['latitude'],
+                'hall_sign' => $orderinfo['hall_sign'],
+                'hall_name' => $orderinfo['hall_name'],
+                'tel' => Db::name('movie_cinema')->where('cinema_sign', $orderinfo['cinema_sign'])->value('tel')
+            ];
+            $film = Db::name('movie_film')->where('film_sign', $orderinfo['film_sign'])->find();
+            $plat_orderinfo['film'] = [
+                'film_sign' => $orderinfo['film_sign'],
+                'film_name' => $orderinfo['film_name'],
+                'language' => $film['language'],
+                'cover_img' => $film['cover_img'],
+                'version' => $film['version'],
+            ];
+            $plat_orderinfo['sched_time'] = date('Y-m-d H:i', strtotime($result['data']['sched_time']));
+            $plat_orderinfo['schedend_time'] = date('m-d H:i', strtotime($result['data']['sched_time']) + $film['duration'] * 60);
 
             unset($plat_orderinfo['plat_order']);
             unset($plat_orderinfo['third_order']);