订单详情

app/common/repositories/movie/MovieRepository.php

@@ -16,8 +16,6 @@ use app\traits\HuiPay;
 use crmeb\services\ApiResponseService;
 use think\exception\ValidateException;
 use think\facade\Db;
-use think\facade\Log;
-use function Symfony\Component\String\b;
 
 /**
  * Class MovieRepository
@@ -175,7 +173,7 @@ class MovieRepository extends BaseRepository
     {
         /** @var StoreOrderRepository $storeOrder */
         $storeOrder = app()->make(StoreOrderRepository::class);
-        $order_sn = $storeOrder->getNewOrderId() . '0';
+        $order_sn = substr($storeOrder->getNewOrderId(), 0, 20);
 
         /** @var CinemaSchedRepository $cinemaSchedRepository */
         $cinemaSchedRepository = app()->make(CinemaSchedRepository::class);
@@ -249,13 +247,13 @@ class MovieRepository extends BaseRepository
      */
     public function confirmOrder($userinfo, $order_sn, $pay_type)
     {
-        $orderinfo = $this->dao->getWhere(['order_sn' => $order_sn, 'uid' => $userinfo->uid])->find();
+        $orderinfo = $this->dao->search(['order_sn' => $order_sn, 'uid' => $userinfo['uid']])->find();
         if (empty($orderinfo)) throw new ValidateException('订单不存在');
         if ($orderinfo['paid'] == 0 && $orderinfo['status'] == 2) throw new ValidateException('订单已超时');
         if ($orderinfo['paid'] == 0 && $orderinfo['status'] == 3) throw new ValidateException('订单已取消');
         if ($orderinfo['paid'] == 1) throw new ValidateException('订单已支付');
 
-        $res = $this->pay($pay_type, $userinfo->wechat_user_id, $orderinfo, $orderinfo['film_name'], env('APP_URL') . "/api/hf_notify/movie", 'delay');
+        $res = $this->pay($pay_type, $userinfo['wechat_user_id'], $orderinfo, $orderinfo['film_name'], env('APP_URL') . "/api/hf_notify/movie", 'delay');
         Db::name('log')->insert(['data' => '汇付电影票订单支付--- 返回参数' . json_encode($res)]);
         if (isset($res['id'])) {
             $type = 0;
@@ -355,11 +353,28 @@ class MovieRepository extends BaseRepository
      */
     public function getOrderInfo($userinfo, $order_sn)
     {
-        $orderinfo = $this->dao->getWhere(['order_sn' => $order_sn, 'uid' => $userinfo->uid])->find();
+        $orderinfo = $this->dao->search(['order_sn' => $order_sn, 'uid' => $userinfo['uid']])->find();
         if (empty($orderinfo)) throw new ValidateException('订单不存在');
 
         $result = DouHuoMallFilmApiRequest::getOrderInfo($order_sn);
-        if (!empty($result) && ($result['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE)) return $result['data'];
+        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['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');
+
+            unset($plat_orderinfo['plat_order']);
+            unset($plat_orderinfo['third_order']);
+            return $plat_orderinfo;
+        }
         throw new ValidateException('订单不存在');
     }
 
@@ -412,7 +427,7 @@ class MovieRepository extends BaseRepository
      */
     public function updateMovieOrderAndcalculationCommissionDividendAward($pay_type, $order_sn, $post_data)
     {
-        $orderinfo = $this->dao->getWhere(['order_sn' => $order_sn])->find();
+        $orderinfo = $this->dao->search(['order_sn' => $order_sn])->find();
         if ($orderinfo) throw new ValidateException('订单不存在');
         Db::startTrans();
         $orderinfo->paid = 1;

route/api.php

@@ -1279,13 +1279,13 @@ Route::group('api/', function () {
         Route::get('film_sched', '/getFilmSched'); // 根据影片排片日期查询排片影院
         Route::get('cinemafilm_sched', '/getCinemaFilmSched'); // 根据影院影片场次日期查询场次列表
         Route::get('sched_seat', '/getSchedSeat'); // 获取场次座位
-        Route::get('order_list', '/getOrderList'); // 订单列表
     })->prefix('api.movie.Movie');
 
     //电影 - 下单业务
     Route::group('movie', function () {
         Route::post('submit_order', '/submitOrder');
         Route::post('confirm_order', '/confirmOrder');
+        Route::get('order_list', '/getOrderList'); // 订单列表
         Route::get('order_info', '/getOrderInfo');
     })->prefix('api.movie.Movie')->middleware(\app\common\middleware\UserTokenMiddleware::class, false);
 })