调整下单支付接口

app/common/repositories/movie/MovieRepository.php

@@ -268,7 +268,7 @@ class MovieRepository extends BaseRepository
         if ($orderinfo['paid'] == 0 && $orderinfo['status'] == 3) throw new ValidateException('订单已取消');
         if ($orderinfo['paid'] == 1) throw new ValidateException('订单已支付');
 
-        $res = $this->movie_pay(strtolower($pay_type), $code, $userinfo['wechat_user_id'], $orderinfo, $orderinfo['film_name'], env('APP_URL') . "/api/hf_notify/movie", 'delay');
+        $res = $this->movie_pay(strtolower($pay_type), $code, '', $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;
@@ -574,10 +574,15 @@ class MovieRepository extends BaseRepository
         $time = time();
         // 订单状态 0：待支付；1：已出票；3：已取消
         $create_time = $create_time + self::tenMinute;
-        if ($plat_status == 1 && ($create_time < $time)) {
-            $status = 0;
-            $state = '待付款';
-            $time_remaining = $time - $create_time;
+        if (($plat_status == 0) || ($plat_status == 1)) {
+            if ($create_time < $time) {
+                $status = 3;
+                $state = '支付超时，已取消';
+            } else {
+                $status = 0;
+                $state = '待付款';
+                $time_remaining = $time - $create_time;
+            }
         } elseif ($plat_status == 5) {
             $status = 3;
             $state = '支付超时，已取消';
@@ -590,7 +595,6 @@ class MovieRepository extends BaseRepository
         }
 
         return compact('status', 'state', 'time_remaining');
-
     }
 
     /**

app/controller/api/merchant/sxy/Access.php

@@ -3,10 +3,12 @@ namespace app\controller\api\merchant\sxy;
 
 use alipay\aop\AopClient;
 use alipay\aop\request\AlipaySystemOauthTokenRequest;
+use app\common\dao\movie\order\MovieOrderDao;
 use app\common\model\store\order\StoreOrder;
 use app\common\model\user\UserCertification;
 use app\common\repositories\merchant\order\OrderGzcRepository;
 use app\common\repositories\merchant\order\OrderMerchantRepository;
+use app\common\repositories\movie\MovieRepository;
 use app\common\repositories\store\order\StoreGroupOrderRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
 use app\controller\Aes;
@@ -787,7 +789,7 @@ class Access
             }
             //b2 精彩生活区的现金+积分支付
             if($array_fzone_paytype['type'] == 'b2'){
-                
+
                 $userdata = Db::name('user')->where('uid',$store_order_data['uid'])->find();
                 //查询用户的积分是否足够
                 $score_pri = $userdata['score'] - $array_fzone_paytype['other'];
@@ -2310,4 +2312,26 @@ class Access
         }
 
     }
+
+    /**
+     * 电影票支付
+     *
+     * @return mixed
+     */
+    public function dy_pay_wechat_mp()
+    {
+        $order_id = Request::param('oid', '');
+        $code = Request::param('code', '');
+        $pay_type = Request::param('type', '');
+        if (empty($order_id)) return app('json')->fail('订单不存在');
+        if (empty($pay_type) || !in_array(strtolower($pay_type), ['wx', 'ali'])) return app('json')->fail('请选择支付方式');
+
+        try {
+            /** @var MovieRepository $movieRepository */
+            $movieRepository = new MovieRepository(new MovieOrderDao());
+            return app('json')->success($movieRepository->confirmOrder(null, $order_id, $pay_type, $code));
+        } catch (\Exception $exception) {
+            return app('json')->fail($exception->getMessage());
+        }
+    }
 }

route/api.php

@@ -1168,6 +1168,8 @@ Route::group('api/', function () {
     //首信易回调
     Route::any('notify/:type', 'api.merchant.sxy.Access/notify');//回调
     Route::any('test1111', 'api.merchant.sxy.Access/test1111');//回调
+    ////app小程序电影票支付
+    Route::get('dy_pay_wechat_mp', 'api.merchant.sxy.Access/dy_pay_wechat_mp');
     //app小程序支付
     Route::get('sxy_pay_wechat_mp', 'api.merchant.sxy.Access/pay_wechat_mp');
     //app小程序话费支付
@@ -1290,7 +1292,6 @@ Route::group('api/', function () {
     Route::group('movie', function () {
         Route::post('submit_order', '/submitOrder');
         Route::post('confirm_order', '/confirmOrder');
-        Route::post('dy_pay_wechat_mp', '/confirmOrder');
         Route::get('order_list', '/getOrderList'); // 订单列表
         Route::get('order_info', '/getOrderInfo');
     })->prefix('api.movie.Movie')->middleware(\app\common\middleware\UserTokenMiddleware::class, false);