family 1 год назад
Родитель
Сommit
4fc2978c51
2 измененных файлов с 4 добавлено и 2 удалено
  1. 1 1
      app/common/repositories/movie/MovieRepository.php
  2. 3 1
      app/controller/api/movie/Movie.php

+ 1 - 1
app/common/repositories/movie/MovieRepository.php

@@ -237,7 +237,7 @@ class MovieRepository extends BaseRepository
237
 //                return $this->pay(
237
 //                return $this->pay(
238
 //                    $_order['pay_type'], $userinfo->wechat_user_id, $_order, $_order['film_name'], env('APP_URL') . "/api/hf_notify/movie",
238
 //                    $_order['pay_type'], $userinfo->wechat_user_id, $_order, $_order['film_name'], env('APP_URL') . "/api/hf_notify/movie",
239
 //                    'delay');
239
 //                    'delay');
240
-        return DouHuoMallFilmApiRequest::confirmOrder($third_order, $order_price);
240
+        return DouHuoMallFilmApiRequest::confirmOrder($orderinfo['order_sn'], $orderinfo['order_price']);
241
     }
241
     }
242
 
242
 
243
     /**
243
     /**

+ 3 - 1
app/controller/api/movie/Movie.php

@@ -206,8 +206,10 @@ class Movie extends BaseController
206
      */
206
      */
207
     public function confirmOrder()
207
     public function confirmOrder()
208
     {
208
     {
209
-        $order_sn = $this->request->param(['order_sn']);
209
+        $order_sn = $this->request->param('order_sn', '');
210
         if (empty($order_sn)) return app('json')->fail('订单不存在');
210
         if (empty($order_sn)) return app('json')->fail('订单不存在');
211
+        $pay_type = $this->request->param('pay_type', '');
212
+        if (empty($pay_type)) return app('json')->fail('请选择支付方式');
211
 
213
 
212
         return app('json')->success($this->repository->confirmOrder($this->request->userInfo(), $order_sn));
214
         return app('json')->success($this->repository->confirmOrder($this->request->userInfo(), $order_sn));
213
     }
215
     }