调整电影支付

app/common/dao/movie/order/MovieOrderDao.php

@@ -57,6 +57,9 @@ class MovieOrderDao extends BaseDao
             ->when(isset($where['order_sn']) && $where['order_sn'] !== '', function ($query) use ($where) {
                 $query->where('order_sn', '=', $where['order_sn']);
             })
+            ->when(isset($where['order_id']) && $where['order_id'] !== '', function ($query) use ($where) {
+                $query->where('order_id', '=', $where['order_id']);
+            })
             ->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) {
                 $query->where('paid', $where['paid']);
             });

app/common/repositories/movie/MovieRepository.php

@@ -230,12 +230,12 @@ class MovieRepository extends BaseRepository
                 'sched_seat' => $params['sched_seat'], // 场次座位
                 'create_time' => time()
             ];
-            $order_sn = Db::transaction(function () use ($userinfo, $_order) {
-                $_order = $this->dao->create($_order);
-                if ($_order) return $_order['order_sn'];
+            $order_id = Db::transaction(function () use ($userinfo, $_order) {
+                $orderModel = $this->dao->create($_order);
+                if ($orderModel) return $orderModel['order_id'];
                 throw new ValidateException('锁座下单失败');
             });
-            return $order_sn;
+            return $order_id;
         } else {
             throw new ValidateException($submitOrder['msg']);
         }
@@ -250,15 +250,15 @@ class MovieRepository extends BaseRepository
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function confirmOrder($userinfo, $order_sn, $pay_type)
+    public function confirmOrder($userinfo, $order_id, $pay_type, $code)
     {
-        $orderinfo = $this->dao->search(['order_sn' => $order_sn, 'uid' => $userinfo['uid']])->find();
+        $orderinfo = $this->dao->search(['order_id' => $order_id])->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->movie_pay($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;
@@ -352,6 +352,150 @@ class MovieRepository extends BaseRepository
     }
 
     /**
+     * 电影票支付
+     *
+     * @param $payType
+     * @param $code
+     * @param $wechat_user_id
+     * @param $orderinfo
+     * @param $title
+     * @param $notify_url
+     * @param $pay_mode
+     * @param $appid
+     * @return array|mixed|void
+     */
+    private function movie_pay($payType, $code, $wechat_user_id, $orderinfo, $title, $notify_url, $pay_mode = null, $appid = '')
+    {
+        if ($payType == 'wx') {
+            if (!$code || $code == '' || $code == 'undefined') {
+                throw new ValidateException('授权失败，code为空');
+            }
+            if ($appid == '') {
+                $pay_wx = systemConfig('pay_wx');
+                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';
+                } 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';
+                }
+            } 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";
+            $get = curlGet($url);
+            Db::name('log')->insert(['data' => 'open_id---' . json_encode($get)]);
+            if (!isset($get['openid']) || empty($get['openid'])) {
+                throw new ValidateException('授权失败');
+            }
+            $member_id = 0;
+            $type = '2';
+            $pay_channel = 'wx_lite';
+
+            $expend = ['open_id' => $get['openid'], 'wx_app_id' => $appid];
+            if (false) {
+//                if ($orderinfo['order_type'] = "movie") {
+                $cfb = sprintf("%01.2f", round(bcmul($orderinfo['order_price'], '0.094', 5), 2));//9.4%的分账
+                $cfb_member = "jsdk_member_1680162243019";
+                //  平台
+                $cxb = sprintf("%01.2f", round(bcsub($orderinfo['order_price'], $cfb, 5), 2));//剩下的归平台
+                $div_members = [
+//                    [
+//                        'member_id' => $member_id,
+//                        'amount' => $cxb,
+//                        'fee_flag' => 'Y'
+//                    ],
+//                    [
+//                        'member_id' => $cfb_member,
+//                        'amount' => $cfb,
+//                        'fee_flag' => 'N'
+//                    ]
+                ];
+            } else {
+                $div_members = [
+                    [
+                        'member_id' => $member_id,
+                        'amount' => $orderinfo['order_price'],
+                        'fee_flag' => 'Y'
+                    ]
+                ];
+            }
+
+            $params = [
+                'order_no' => $orderinfo['order_sn'],
+                'app_id' => $app_id,
+                'pay_channel' => $pay_channel,
+                'pay_amt' => (string)$orderinfo['order_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()
+                ],
+                'expend' => json_encode($expend),
+                'div_members' => json_encode($div_members),
+                'fee_mode' => 'I',
+                'notify_url' => $notify_url
+            ];
+            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') {
+            $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_0827b960-b932-45ec-b800-4e850091b419';
+//            $key='api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
+
+            $div_members = [
+                [
+                    'member_id' => $member_id,
+                    'amount' => $orderinfo['order_price'],
+                    'fee_flag' => 'Y'
+                ]
+            ];
+
+            $params = [
+                'order_no' => $orderinfo['order_sn'],
+                'app_id' => $app_id,
+                'pay_channel' => $pay_channel,
+                'pay_amt' => (string)$orderinfo['order_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()
+                ],
+                'div_members' => json_encode($div_members),
+                'fee_mode' => 'I',
+                'notify_url' => $notify_url
+            ];
+            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);
+        }
+    }
+
+    /**
      * @param $userinfo
      * @param $order_sn
      * @return mixed|string

app/controller/api/movie/Movie.php

@@ -203,9 +203,9 @@ class Movie extends BaseController
         if (empty($params['sched_seat'])) return app('json')->fail('请选择观影座位');
 
         try {
-            $result = $this->repository->submitOrder($this->request->userInfo(), $params);
-            if (!empty($result)) {
-                return app('json')->success(['order_sn' => $result]);
+            $order_id = $this->repository->submitOrder($this->request->userInfo(), $params);
+            if (!empty($order_id)) {
+                return app('json')->success(['oid' => $order_id, 'code' => '', 'type' => 'wx']);
             } else {
                 return app('json')->fail('锁座下单失败');
             }
@@ -221,13 +221,14 @@ class Movie extends BaseController
      */
     public function confirmOrder()
     {
-        $order_sn = $this->request->param('order_sn', '');
-        if (empty($order_sn)) return app('json')->fail('订单不存在');
-        $pay_type = $this->request->param('pay_type', '');
-        if (empty($pay_type) || !in_array($pay_type, ['wx', 'ali'])) return app('json')->fail('请选择支付方式');
+        $order_id = $this->request->param('oid', '');
+        $code = $this->request->param('code', '');
+        $pay_type = $this->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 {
-            return app('json')->success($this->repository->confirmOrder($this->request->userInfo(), $order_sn, $pay_type));
+            return app('json')->success($this->repository->confirmOrder($this->request->userInfo(), $order_id, $pay_type, $code));
         } catch (\Exception $exception) {
             return app('json')->fail($exception->getMessage());
         }

route/api.php

@@ -1290,6 +1290,7 @@ 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);