From e11ae487d0d8ed511f0549b05abc746b4ea72e13 Mon Sep 17 00:00:00 2001
From: tpingzhang <635929049@qq.com>
Date: Tue, 5 Nov 2019 11:27:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8C=E4=B9=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sdk/Controller/PayH5Controller.class.php     | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/Application/Sdk/Controller/PayH5Controller.class.php b/Application/Sdk/Controller/PayH5Controller.class.php
index 78fe4d88..dee07c74 100644
--- a/Application/Sdk/Controller/PayH5Controller.class.php
+++ b/Application/Sdk/Controller/PayH5Controller.class.php
@@ -353,13 +353,23 @@ class PayH5Controller extends BaseController{
         	$data['mchAppName'] = "mchAppName";
         	$data['deviceInfo'] = "AND_WAP";
         	$data['clientIp'] = get_client_ip();
+        	$orderno = $request['pay_order_number'];
         	
         	$ret = $sqpay->sq_pay($data);
         	$ret = json_decode($ret, true);
         	$json_data['url']=$ret[0]['payURL'];
         	if($ret[0]['respCode'] == '000000'){
-        		echo json_encode(['code'=>200,'msg'=>'','data'=>['url'=>$json_data['url'],'wap'=>1]]);
-        		exit;
+        		// 存入pay_url  继续支付
+        		M("spend", "tab_")->where([
+	        		'extend' => $request['extend'],
+	        		'game_id' => $request['game_id'],
+	        		'pay_order_number' => $request["pay_order_number"]
+        		])->save([
+        			'pay_url' => $json_data['url']
+        		]);
+        		
+        		/* echo json_encode(['code'=>200,'msg'=>'','data'=>['url'=>$json_data['url'],'wap'=>1]]);
+        		exit; */
         	} else {
         		echo json_encode(['code'=>0,'msg'=>$ret[0]['respMess'],'wap'=>1]);
         		exit;
@@ -572,7 +582,7 @@ ADD COLUMN `pay_url`  text NULL AFTER `check_sign`;
             $is_pay = json_decode($weixn->weixin_pay("充值", $request['pay_order_number'], $pay_amount, 'MWEB'), true);
            
             if($is_pay['status']==1){
-                $json_data['url'] = $is_pay['mweb_url'].'&redirect_url='.C('PAY_DOMAIN')."sdk.php/Spend/paycallback/orderno/{$request['pay_order_number']}/user_token/".$this->userToken;
+                $json_data['url'] = $is_pay['mweb_url'].'&redirect_url='.C('PAY_DOMAIN')."sdk.php/Spend/paycallback/orderno/{$request['pay_order_number']}/user_token/".$this->userToken."/paytype/weixinpay";
                 $request['pay_url'] = $json_data['url'];
                 $this->add_deposit($request, 1);
 //                 		.(is_ssl()?'https%3A%2F%2F':'http%3A%2F%2F'). $_SERVER ['HTTP_HOST'] . "%2Fsdk.php%2FSpend%2Fpay_success%2Forderno%2F".$request['pay_order_number'].'%2Fgame_id%2F'.$request['game_id'] ;