订单详情返回oid，type字段

app/common/repositories/movie/MovieRepository.php

@@ -272,7 +272,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($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, $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;
@@ -467,7 +467,7 @@ class MovieRepository extends BaseRepository
                 unset($params['fee_mode']);
             }
             return $this->Payment_create_traits_b($params, $type, $key);
-        } elseif ($payType == 'ALI') {
+        } elseif ($payType == 'ali') {
             $member_id = 0;
             $type = '1';
             $pay_channel = 'alipay_qr';
@@ -522,6 +522,8 @@ class MovieRepository extends BaseRepository
         $result = DouHuoMallFilmApiRequest::getOrderInfo($order_sn);
         if (!empty($result) && ($result['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE)) {
             $plat_orderinfo = $result['data'];
+            $plat_orderinfo['oid'] = $orderinfo['order_id'];
+            $plat_orderinfo['type'] = ($orderinfo['pay_type'] == 1) ? 'wx' : ($orderinfo['pay_type'] == 2 ? 'ali' : 'wx');
             $plat_orderinfo['order_price'] = $orderinfo['order_price'];
             $plat_orderinfo['order_sn'] = $order_sn;
             $plat_orderinfo['create_time'] = strtotime($orderinfo['create_time']);