From 5ebd730df1f870a7dde84c7854e2465de058c014 Mon Sep 17 00:00:00 2001
From: tping <tpingzhang11@126.com>
Date: Tue, 17 Mar 2020 18:25:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8C=E4=B9=BE=E5=BF=AB=E6=8D=B7=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/ShortcutController.class.php   | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/Application/Sdk/Controller/ShortcutController.class.php b/Application/Sdk/Controller/ShortcutController.class.php
index 648ffd8e..d25b6d60 100644
--- a/Application/Sdk/Controller/ShortcutController.class.php
+++ b/Application/Sdk/Controller/ShortcutController.class.php
@@ -769,22 +769,26 @@ class ShortcutController extends BaseController{
 
     public function sq_pay_step2() {
         $is_platform = 0;
-        if (I('request.code') == 0 && I('request.type') == 'platform') {
+        $code = I('request.code', 0);
+        if ($code == 0 && I('request.type') == 'platform') {
             $is_platform = 1;	// 平台币充值
         }
+        $userId = I('request.user_id');
+        $gameId = I('request.game_id');
+        $extend = I('request.extend', '');
 
         //$prefix = ($is_platform == 1) ? 'PF_' : 'SP_';
         //$request['pay_order_number'] = $prefix . date('Ymd') . date('His') . sp_random_string(4);
-        $request['game_id'] = I('request.game_id');
+        $request['game_id'] = $gameId;
         $game_id = $request['game_id'];
-        $request['user_id'] = I('request.user_id');
+        $request['user_id'] = $userId;
         $user_id = $request['user_id'];
         $request['code'] = I('request.code');
 
         $payInfo = M('pay_info', 'tab_')->where([
-            'user_id' => I('user_id'),
-            'game_id' => I('game_id'),
-            'extend' => I('extend'),
+            'user_id' => $userId,
+            'game_id' => $gameId,
+            'extend' => $extend,
         ])->order('id desc')->find();
 
         $request['price'] = $payInfo['price'];
@@ -834,9 +838,9 @@ class ShortcutController extends BaseController{
         // 平台币充值
         if ($is_platform) {
             $request['code'] = 0;
-            $request['user_id'] = I('request.user_id');
+            $request['user_id'] = $user_id;
             $request['price'] = intval(I('request.price'));
-            $request['game_id'] = I('request.game_id');
+            $request['game_id'] = $game_id;
             $request['pay_way'] = C("PAY_WAY.SQ_SHORTCUT");   // 支付方式(-1绑币 0:平台币,1:支付宝,2:微信(扫码)3微信app 4 威富通 5聚宝云 6竣付通 7苹果支付8金猪支付 9双乾支付-支付宝 10双乾支付-银联 15双乾支付-快捷
             $request['pay_status'] = 0;
             $request['spend_ip'] = get_client_ip();
@@ -845,9 +849,9 @@ class ShortcutController extends BaseController{
             $request['goods_info'] = $payInfo['info']['game_name'].$payInfo['info']['body'];
 
             $payInfo = M('pay_info', 'tab_')->where([
-                'user_id' => I('user_id'),
-                'game_id' => I('game_id'),
-                'extend' => I('extend'),
+                'user_id' => $user_id,
+                'game_id' => $game_id,
+                'extend' => $extend,
             ])->order('id desc')->find();
             $request['pay_order_number'] = $payInfo['order_id'];
 
@@ -857,9 +861,9 @@ class ShortcutController extends BaseController{
         } else {  // 游戏充值
             $request['code'] = 1;
             $payInfo = M('pay_info', 'tab_')->where([
-                'user_id' => I('user_id'),
-                'game_id' => I('game_id'),
-                'extend' => I('extend'),
+                'user_id' => $user_id,
+                'game_id' => $game_id,
+                'extend' => $extend,
             ])->order('id desc')->find();
             if ($payInfo) {
                 $info = json_decode($payInfo['info'], true);
@@ -903,14 +907,14 @@ class ShortcutController extends BaseController{
         $this->assign("user_id", $request['user_id']);
         $this->assign("game_id", $request['game_id']);
         $this->assign("user_token", $userToken);
-        $this->assign("extend", I('extend'));
+        $this->assign("extend", $extend);
         $this->assign("order_id", $request['pay_order_number']);
         $this->assign('goods_info',$request['goods_info']);
 
         $bank_info = $this->checkBankCard();
 
         $this->assign('bank_info',$bank_info);
-        $this->assign('cardNo',I('card_no'));
+        $this->assign('cardNo',I('request.card_no'));
 
         $this->display('yee_step2');