Merge remote-tracking branch 'origin/dev' into dev

Application/Sdk/Controller/ShortcutController.class.php

@@ -584,18 +584,10 @@ class ShortcutController extends BaseController{
         } else {
             $data['redirectUrl'] = C('PAY_DOMAIN').U('Spend/shortcut_notice',array('status'=> 1, 'orderno' => $payInfo['order_id'], 'user_id'=>I('user_id'),'game_id'=>I('game_id'), 'user_token' => I('request.user_token')));
         }
-        /* $bankCardNo = I('bankCardNo', '');
-        $idCardNo = I('idCardNo', '');
-        $cardName = I('cardName', '');
-        if (!$bankCardNo || !$idCardNo || !$cardName) {
-            echo json_encode(['code'=>0,'msg'=> '参数有误']);
-            exit;
-        }
-        $data['paymentParamExt'] = '{"bankCardNo":"'.$bankCardNo.'","idCardNo":"'.$idCardNo.'","cardName":"'.$cardName.'"}';
-         */
+        
         $data['paymentParamExt'] = '{}';
         $yeeData = $yeepay->yee_pay($data);
-//         var_dump($yeeData);//die;
+//         var_dump($data, $yeeData);//die;
         if ($yeeData['data']['result']['code'] != 'OPR00000') {
             echo json_encode(['code'=>0, 'msg'=> '支付参数有误，请重试'.$yeeData['data']['result']['code']]);
             exit;

ThinkPHP/Library/Org/YeepaySDK/Yeepay.class.php

@@ -48,9 +48,9 @@ class Yeepay
             return -1;  // 签名验证失败
         }
         //取得返回结果
-        $data = $this->object_array($response);
+        $ret = $this->object_array($response);
         
-        $token=$data['result']['token'];
+        $token= $ret['result']['token'];
         $cashter = array(
             "merchantNo" => $merchantNo ,
             "token" => $token,
@@ -61,12 +61,12 @@ class Yeepay
             "userType" => $data['userType'] ?? '',
             "ext" => $data['ext'] ?? '',
         );
-//         var_dump($data);
+//         var_dump($data, $cashter);
         $getUrl = $this->getUrl($cashter, $privateKey);
         $getUrl=str_replace("&timestamp","&timestamp",$getUrl);
         $url = "https://cash.yeepay.com/cashier/std?" . $getUrl;
 //         echo $url;
-        return array('url' => $url, 'data' => $data);
+        return array('url' => $url, 'data' => $ret);
         
     }