调整获取订单详情接口

app/common/repositories/movie/MovieRepository.php

@@ -10,6 +10,8 @@ namespace app\common\repositories\movie;
 use app\common\dao\movie\order\MovieOrderDao;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
+use crmeb\services\ApiResponseService;
+use think\exception\ValidateException;
 use think\facade\Db;
 use think\facade\Log;
 
@@ -115,7 +117,7 @@ class MovieRepository extends BaseRepository
 
         $order_price = round($params['number'] * $params['price'], 2);
         $submitOrder = DouHuoMallFilmApiRequest::submitOrder($userinfo->phone, $params['channel_type'], $params['sched_sign'], $order_sn, $order_price);
-        if (!empty($submitOrder) && isset($submitOrder['code']) && ($submitOrder['code'] == 200) && isset($submitOrder['data']['plat_order'])){
+        if (!empty($submitOrder) && isset($submitOrder['code']) && ($submitOrder['code'] == 200) && isset($submitOrder['data']['plat_order'])) {
             $_order = [
                 'uid' => $userinfo->uid,
                 'mobile' => $userinfo->phone,
@@ -149,7 +151,7 @@ class MovieRepository extends BaseRepository
 
             $group = Db::transaction(function () use ($userinfo, $_order) {
                 $_order = $this->dao->create($_order);
-                if ($_order) return static::pay();
+                if ($_order) return static::pay($_order['pay_type']);
 
 
             });
@@ -159,166 +161,166 @@ class MovieRepository extends BaseRepository
         }
     }
 
-    private static function pay($payType,$code,$groupOrder,$title,$notify_url,$pay_mode=null,$appid=''){
+    private static function pay($payType, $code, $groupOrder, $title, $notify_url, $pay_mode = null, $appid = '')
+    {
 
         $order_no = $groupOrder['group_order_sn'] ?? $groupOrder['order_no'];
 
 
+        if ($payType == 'wx') {
 
-        if($payType == 'wx'){
-
-            if(!$code || $code == '' || $code =='undefined')
+            if (!$code || $code == '' || $code == 'undefined')
                 return "授权失败，code为空";
-            if($appid == '') {
+            if ($appid == '') {
 
 
                 $pay_wx = systemConfig('pay_wx');
 
-                if ($pay_wx == 2){
+                if ($pay_wx == 2) {
                     $appid = env('WECHAT_MP.APPID');
                     $new_secret = env('WECHAT_MP.SECRET');
 
-                    $app_id='app_0827b960-b932-45ec-b800-4e850091b419';
-                    $key='api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
+                    $app_id = 'app_0827b960-b932-45ec-b800-4e850091b419';
+                    $key = 'api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
 
-                }elseif ($pay_wx == 3){
+                } elseif ($pay_wx == 3) {
                     $appid = env('WECHAT_TDYL.APPID');
                     $new_secret = env('WECHAT_TDYL.SECRET');
 
 
-                    Db::name('log')->insert(['data'=>'appid---'.$appid]);
-                    Db::name('log')->insert(['data'=>'new_secret---'.$new_secret]);
-                    $app_id='app_383a75dd-c03d-44ab-8f58-92c60fe9b9d0';
-                    $key='api_live_b0a687ec-5450-4ada-a0e4-65bac0f46871';
+                    Db::name('log')->insert(['data' => 'appid---' . $appid]);
+                    Db::name('log')->insert(['data' => 'new_secret---' . $new_secret]);
+                    $app_id = 'app_383a75dd-c03d-44ab-8f58-92c60fe9b9d0';
+                    $key = 'api_live_b0a687ec-5450-4ada-a0e4-65bac0f46871';
 
                 }
 
-            }else{
-                $app_id='app_0827b960-b932-45ec-b800-4e850091b419';
-                $key='api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
+            } else {
+                $app_id = 'app_0827b960-b932-45ec-b800-4e850091b419';
+                $key = 'api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
                 $new_secret = "c8cbe24fa3b83f77a88b79554b3aeab4";
             }
 
-            $url = "https://api.weixin.qq.com/sns/jscode2session?appid=".$appid."&secret=".$new_secret."&js_code=".$code."&grant_type=authorization_code";
+            $url = "https://api.weixin.qq.com/sns/jscode2session?appid=" . $appid . "&secret=" . $new_secret . "&js_code=" . $code . "&grant_type=authorization_code";
             $get = curlGet($url);
-            Db::name('log')->insert(['data'=>'pay_wx---'.$pay_wx]);
-            Db::name('log')->insert(['data'=>'code---'.$code]);
-            Db::name('log')->insert(['data'=>'url---'.$url]);
-            Db::name('log')->insert(['data'=>'open_id---'.json_encode($get)]);
-            if(!isset($get['openid']) || empty($get['openid'])){
+            Db::name('log')->insert(['data' => 'pay_wx---' . $pay_wx]);
+            Db::name('log')->insert(['data' => 'code---' . $code]);
+            Db::name('log')->insert(['data' => 'url---' . $url]);
+            Db::name('log')->insert(['data' => 'open_id---' . json_encode($get)]);
+            if (!isset($get['openid']) || empty($get['openid'])) {
                 return '授权失败';
             }
             $openid = $get['openid'];
 
-            $member_id=0;
-            $type='2';
-            $pay_channel='wx_lite';
+            $member_id = 0;
+            $type = '2';
+            $pay_channel = 'wx_lite';
 
-            $expend=[
-                'open_id'=>$openid,
-                'wx_app_id'=> $appid
+            $expend = [
+                'open_id' => $openid,
+                'wx_app_id' => $appid
             ];
 
 
-            if ($groupOrder['order_type'] = "marketing"){
+            if ($groupOrder['order_type'] = "marketing") {
 
-                db::name("test_log")->insert(["note"=>"pay_huifu" . json_encode($groupOrder)]);
+                db::name("test_log")->insert(["note" => "pay_huifu" . json_encode($groupOrder)]);
                 // 创富宝 分账
                 //创富宝
-                $cfb = sprintf("%01.2f",round(bcmul($groupOrder['pay_price'],'0.094',5),2));//9.4%的分账
+                $cfb = sprintf("%01.2f", round(bcmul($groupOrder['pay_price'], '0.094', 5), 2));//9.4%的分账
 
                 $cfb_member = "jsdk_member_1680162243019";
                 //  平台
-                $cxb = sprintf("%01.2f",round(bcsub($groupOrder['pay_price'],$cfb,5),2));//剩下的归平台
+                $cxb = sprintf("%01.2f", round(bcsub($groupOrder['pay_price'], $cfb, 5), 2));//剩下的归平台
 
-                $div_members=[
+                $div_members = [
                     [
-                        'member_id'=>$member_id,
-                        'amount'=>$cxb,
-                        'fee_flag'=>'Y'
+                        'member_id' => $member_id,
+                        'amount' => $cxb,
+                        'fee_flag' => 'Y'
                     ],
                     [
-                        'member_id'=>$cfb_member,
-                        'amount'=>$cfb,
-                        'fee_flag'=>'N'
+                        'member_id' => $cfb_member,
+                        'amount' => $cfb,
+                        'fee_flag' => 'N'
                     ]
                 ];
-            }else{
-                $div_members=[
+            } else {
+                $div_members = [
                     [
-                        'member_id'=>$member_id,
-                        'amount'=>$groupOrder['pay_price'],
-                        'fee_flag'=>'Y'
+                        'member_id' => $member_id,
+                        'amount' => $groupOrder['pay_price'],
+                        'fee_flag' => 'Y'
                     ]
                 ];
             }
 
-            $params=[
-                'order_no'=>$order_no."_".rand(1000,9999),
-                'app_id'=>$app_id,
-                'pay_channel'=>$pay_channel,
-                'pay_amt'=>(string)$groupOrder['pay_price'],
-                'goods_title'=> strlen($title) > 64 ? mb_substr($title, 0, 64,'utf-8') : $title,// 解决因为太长不能支付问题
-                'goods_desc' => strlen($title) > 42 ? mb_substr($title, 0, 127,'utf-8') : $title,// 解决因为太长不能支付问题
-                'device_info'=>[
-                    'device_ip'=>app('request')->ip()
+            $params = [
+                'order_no' => $order_no . "_" . rand(1000, 9999),
+                'app_id' => $app_id,
+                'pay_channel' => $pay_channel,
+                'pay_amt' => (string)$groupOrder['pay_price'],
+                'goods_title' => strlen($title) > 64 ? mb_substr($title, 0, 64, 'utf-8') : $title,// 解决因为太长不能支付问题
+                'goods_desc' => strlen($title) > 42 ? mb_substr($title, 0, 127, 'utf-8') : $title,// 解决因为太长不能支付问题
+                'device_info' => [
+                    'device_ip' => app('request')->ip()
 //                    'device_ip'=>'115.171.134.68'
                 ],
 
-                'expend'=>json_encode($expend),
-                'div_members'=>json_encode($div_members),
-                'fee_mode'=>'I',
-                'notify_url'=>$notify_url
+                'expend' => json_encode($expend),
+                'div_members' => json_encode($div_members),
+                'fee_mode' => 'I',
+                'notify_url' => $notify_url
             ];
-            if($pay_mode == 'delay'){
+            if ($pay_mode == 'delay') {
                 $params['pay_mode'] = 'delay';
                 unset($params['div_members']);
                 unset($params['fee_mode']);
             }
-            return $this->Payment_create_traits_b($params,$type,$key);
-        }elseif($payType=='ALI'){
+            return $this->Payment_create_traits_b($params, $type, $key);
+        } elseif ($payType == 'ALI') {
 //            throw new AuthException('支付宝正在升级，请使用微信支付');
-            $member_id=0;
-            $type='1';
-            $pay_channel='alipay_qr';
+            $member_id = 0;
+            $type = '1';
+            $pay_channel = 'alipay_qr';
             // 天地博爱科技通道
-            $app_id='app_44108546-d27a-48ee-88c1-84b45b75114f';
-            $key='api_live_b23537ed-64b8-45d6-832e-fb228aa9e0a9';
+            $app_id = 'app_44108546-d27a-48ee-88c1-84b45b75114f';
+            $key = 'api_live_b23537ed-64b8-45d6-832e-fb228aa9e0a9';
             // 天地博爱通道
 //            $app_id='app_0827b960-b932-45ec-b800-4e850091b419';
 //            $key='api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
 
-            $div_members=[
+            $div_members = [
                 [
-                    'member_id'=>$member_id,
-                    'amount'=>$groupOrder['pay_price'],
-                    'fee_flag'=>'Y'
+                    'member_id' => $member_id,
+                    'amount' => $groupOrder['pay_price'],
+                    'fee_flag' => 'Y'
                 ]
             ];
 
-            $params=[
-                'order_no'=>$order_no."_".rand(1000,9999),
-                'app_id'=>$app_id,
-                'pay_channel'=>$pay_channel,
-                'pay_amt'=>(string)$groupOrder['pay_price'],
-                'goods_title'=> strlen($title) > 64 ? mb_substr($title, 0, 64,'utf-8') : $title,// 解决因为太长不能支付问题
-                'goods_desc' => strlen($title) > 42 ? mb_substr($title, 0, 127,'utf-8') : $title,// 解决因为太长不能支付问题
-                'device_info'=>[
-                    'device_ip'=>app('request')->ip()
+            $params = [
+                'order_no' => $order_no . "_" . rand(1000, 9999),
+                'app_id' => $app_id,
+                'pay_channel' => $pay_channel,
+                'pay_amt' => (string)$groupOrder['pay_price'],
+                'goods_title' => strlen($title) > 64 ? mb_substr($title, 0, 64, 'utf-8') : $title,// 解决因为太长不能支付问题
+                'goods_desc' => strlen($title) > 42 ? mb_substr($title, 0, 127, 'utf-8') : $title,// 解决因为太长不能支付问题
+                'device_info' => [
+                    'device_ip' => app('request')->ip()
 //                    'device_ip'=>'115.171.134.68'
                 ],
 
 //                    'expend'=>json_encode($expend),
-                'div_members'=>json_encode($div_members),
-                'fee_mode'=>'I',
-                'notify_url'=>$notify_url
+                'div_members' => json_encode($div_members),
+                'fee_mode' => 'I',
+                'notify_url' => $notify_url
             ];
-            if($pay_mode == 'delay'){
+            if ($pay_mode == 'delay') {
                 $params['pay_mode'] = 'delay';
                 unset($params['div_members']);
                 unset($params['fee_mode']);
             }
-            return $this->Payment_create_traits_a($params,$type,$key);
+            return $this->Payment_create_traits_a($params, $type, $key);
         }
 
     }
@@ -334,11 +336,17 @@ class MovieRepository extends BaseRepository
     }
 
     /**
-     * @param $third_order
+     * @param $userinfo
+     * @param $order_sn
      * @return mixed|string
      */
-    public function getOrderInfo($third_order)
+    public function getOrderInfo($userinfo, $order_sn)
     {
-        return DouHuoMallFilmApiRequest::getOrderInfo($third_order);
+        $orderinfo = $this->dao->getWhere(['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'];
+        throw new ValidateException('订单不存在');
     }
 }

app/controller/api/movie/Movie.php

@@ -188,12 +188,9 @@ class Movie extends BaseController
      */
     public function getOrderInfo()
     {
-        $relation_id = $this->request->param(['relation_id']);
-        if (empty($cinema_sign)) return app('json')->fail('请选择场次');
-
-        $sched_sign = $this->request->param(['sched_sign']);
-        if (empty($film_sign)) return app('json')->fail('请选择场次');
+        $order_sn = $this->request->param('order_sn','');
+        if (empty($order_sn)) return app('json')->fail('订单不存在');
 
-        return app('json')->success($this->repository->getOrderInfo($relation_id, $sched_sign));
+        return app('json')->success($this->repository->getOrderInfo($this->request->userInfo(), $order_sn));
     }
 }