From 36d4af18254e1b52788d03efb9a0ede602e957bd Mon Sep 17 00:00:00 2001
From: tpingzhang <635929049@qq.com>
Date: Mon, 16 Dec 2019 15:41:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A8=81=E5=AF=8C=E9=80=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Sdk/Controller/PayH5Controller.class.php | 5 +++--
 Application/Sdk/View/default/Spend/pay_way.html      | 2 +-
 ThinkPHP/Library/Org/HeepaySDK/Heepay.class.php      | 7 ++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Application/Sdk/Controller/PayH5Controller.class.php b/Application/Sdk/Controller/PayH5Controller.class.php
index 717f1f5f..6dfa05cc 100644
--- a/Application/Sdk/Controller/PayH5Controller.class.php
+++ b/Application/Sdk/Controller/PayH5Controller.class.php
@@ -1291,15 +1291,16 @@ ADD COLUMN `pay_url`  text CHARACTER SET utf8 COLLATE utf8_general_ci NULL AFTER
             $pay['amount'] = $request['price'];
             $pay['user_ip'] = get_client_ip();
             $pay['sign_key'] = C('heepay.key');//密钥
-            $pay['payerName'] = "万盟天下";
+            $pay['payerName'] = iconv("UTF-8", "gb2312//IGNORE", "万盟天下");
             $pay['number'] = 1;
             $pay['goods_note']= "消费-".$request["pay_order_number"];
             $pay['device'] = "wap";
             $pay['bank_card_type'] = 0;
             $pay['return_url'] = C('PAY_DOMAIN')."sdk.php/Spend/paycallback/orderno/{$request['pay_order_number']}/user_token/".$this->userToken."/paytype/weixinpay/game_id/{$game_id}";
+            $pay['notify_url'] = C('PAY_DOMAIN')."/callback.php/Notify/heepay_callback";
             $heepay = new Heepay();
             $url = $heepay->wxh5_pay($pay);
-            $request['pay_url'] = $url."&tx_client=hideopen";
+            $request['pay_url'] = $url/* ."&tx_client=hideopen" */;
             
             $this->add_spend($request,1);
     	}elseif(get_wx_pay_type() == 2){
diff --git a/Application/Sdk/View/default/Spend/pay_way.html b/Application/Sdk/View/default/Spend/pay_way.html
index 399b4e76..cf10a90a 100644
--- a/Application/Sdk/View/default/Spend/pay_way.html
+++ b/Application/Sdk/View/default/Spend/pay_way.html
@@ -191,7 +191,7 @@
                 </if>
                 
                 <if condition="$pay_price elt C('WX_PAY_LIMIT')">
-                    <if condition="C('wei_xin.status') eq 1 or C('weixin_gf.status') eq 1 or (C('goldpig.status') eq 1 and C('goldpig.wx') eq 1) or (C('heepay.status') eq 1 and C('heepay.wxp') eq 1) or (C('sqpay.status') eq 1 and C('sqpay.wx_small') eq 1)">
+                    <if condition="C('wei_xin.status') eq 1 or C('weixin_gf.status') eq 1 or (C('goldpig.status') eq 1 and C('goldpig.wx') eq 1) or (C('heepay.status') eq 1) or (C('sqpay.status') eq 1 and C('sqpay.wx_small') eq 1)">
                     <a id="wxpay" style="display: none;" class="weui-cell" data-url="{:U('PayH5/weixin_pay',array('user_id'=>I('user_id'),'game_id'=>I('game_id'),'user_token'=>I('user_token'),'api_ver'=>2))}" class="recharge_way_btn recharge_way_btn_wechat">
                         <div class="weui-cell__hd"><img src="__IMG__/wxpay.png"></div>
                         <div class="weui-cell__bd">
diff --git a/ThinkPHP/Library/Org/HeepaySDK/Heepay.class.php b/ThinkPHP/Library/Org/HeepaySDK/Heepay.class.php
index ed5c1738..a42fb653 100644
--- a/ThinkPHP/Library/Org/HeepaySDK/Heepay.class.php
+++ b/ThinkPHP/Library/Org/HeepaySDK/Heepay.class.php
@@ -14,7 +14,7 @@ class Heepay  {
         $sign_str  = $sign_str . '&agent_bill_time=' . $pay['time'];
         $sign_str  = $sign_str . '&pay_type=' . $pay['pay_type'];
         $sign_str  = $sign_str . '&pay_amt=' . $pay['amount'];
-        $sign_str  = $sign_str .  '&notify_url=http://'.$_SERVER['HTTP_HOST']."/callback.php/Notify/heepay_callback";
+        $sign_str  = $sign_str .  '&notify_url=' . $pay['notify_url'];
         $sign_str  = $sign_str . '&user_ip=' . $pay['user_ip'];
         $sign_str = $sign_str . '&key=' . $pay['sign_key'];//密钥
         $sign = md5($sign_str); //签名值
@@ -51,7 +51,7 @@ class Heepay  {
     	$sign_str  = $sign_str . '&agent_bill_time=' . $pay['time'];
     	$sign_str  = $sign_str . '&pay_type=30';
     	$sign_str  = $sign_str . '&pay_amt=' . $pay['amount'];
-    	$sign_str  = $sign_str .  '&notify_url=http://'."api.wmtxkj.com"."/callback.php/Notify/heepay_callback";
+    	$sign_str  = $sign_str .  '&notify_url='.$pay['notify_url'];
     	$sign_str  = $sign_str .  '&return_url='.$pay['return_url'];
     	$sign_str  = $sign_str .  '&user_ip='. $pay['user_ip'];
     	$sign_str  = $sign_str . '&bank_card_type='. $pay['bank_card_type'];
@@ -75,7 +75,7 @@ class Heepay  {
     		'agent_id'=>$pay['agent_id'],//商户号
     		'agent_bill_id'=>$pay['order_no'],//订单号
     		'pay_amt'=>$pay['amount'],//支付金额
-   			'notify_url'=>"http://"."api.wmtxkj.com"."/callback.php/Notify/heepay_callback",//通知地址
+   			'notify_url'=> $pay['notify_url'],//通知地址
    			'return_url' => $pay['return_url'],
    			'user_ip'=>$pay['user_ip'],//用户ip
     		'agent_bill_time'=>$pay['time'],//date('YmdHis', time()) 时间
@@ -90,6 +90,7 @@ class Heepay  {
   	 	);
     	$xml=$this->request_post("https://Pay.Heepay.com/DirectPay/applypay.aspx", $data);
     	$string=explode("<redirectUrl><![CDATA[",$xml);
+//     	pp($string);
     	$token_id=explode("]]></redirectUrl>",$string[1]);
     	return $token_id[0];
     }

From 42f1ac959189677ebb1ca225748dfced49eb432e Mon Sep 17 00:00:00 2001
From: tpingzhang <635929049@qq.com>
Date: Mon, 16 Dec 2019 17:58:43 +0800
Subject: [PATCH 2/3] platform_pay

---
 Application/Sdk/Controller/UserHController.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Sdk/Controller/UserHController.class.php b/Application/Sdk/Controller/UserHController.class.php
index 02bc6f54..a6205a32 100644
--- a/Application/Sdk/Controller/UserHController.class.php
+++ b/Application/Sdk/Controller/UserHController.class.php
@@ -90,7 +90,7 @@ class UserHController extends Controller
             'game_id' => I('game_id'),
             'order_id' => $out_trade_no,
             'price' => $money,
-            'type' => 'bind_pay',
+            'type' => 'platform_pay',
             'status' => 'normal',
             'create_time' => time(),
             'user_account' => $user_info['account'],

From b6d7c20c326c1a5980c65b540f9ed52d47c70783 Mon Sep 17 00:00:00 2001
From: tpingzhang <635929049@qq.com>
Date: Tue, 17 Dec 2019 15:40:40 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1=EF=BC=8Capple=20beta=E7=89=88=20=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B4=A6=E5=8F=B7=E8=B5=B0=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E6=94=AF=E4=BB=98=202=EF=BC=8C=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E7=BB=9F=E4=B8=80bug=203=EF=BC=8C?=
 =?UTF-8?q?=E6=A8=AA=E7=AB=96=E7=89=88=E5=88=87=E6=8D=A2=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/ExchangeController.class.php   | 10 ++++-
 .../Sdk/Controller/PayH5Controller.class.php  | 41 +++++++++++--------
 .../Sdk/View/default/Spend/pay_way.html       |  3 +-
 3 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/Application/Sdk/Controller/ExchangeController.class.php b/Application/Sdk/Controller/ExchangeController.class.php
index f2793e0f..815f7ce1 100644
--- a/Application/Sdk/Controller/ExchangeController.class.php
+++ b/Application/Sdk/Controller/ExchangeController.class.php
@@ -185,9 +185,15 @@ class ExchangeController extends BaseController{
 				$this->set_message(1089,"fail","订单号重复，请关闭支付页面重新支付");
             }
 
-//             file_put_contents("./Application/Sdk/Scheme/".$request['game_id'].".txt",$request['scheme']);
+            // -----------apple beta版  测试账号走第三方支付
+            $testUser = ['test11', 'test12', 'test13', 'test142', 
+        	'test171','test830','test1003','test1002','test170','test169'];
+            $istest = false;
+            if (in_array($userPlayInfo['user_account'], $testUser)) {
+            	$istest = true;
+            }
 
-            if(get_game_appstatus2($request['game_id'])/* &&$request['is_create_ordernumer']!=1 */){ /* 第三方支付 */
+            if(get_game_appstatus2($request['game_id'] || $istest)/* &&$request['is_create_ordernumer']!=1 */){ /* 第三方支付 */
 				$prefix = $request['code'] == 1 ? "SP_" : "PF_";  // SP
                 $out_trade_no = $prefix.date('Ymd').date('His').sp_random_string(4);
                 $request['pay_order_number'] = $out_trade_no;
diff --git a/Application/Sdk/Controller/PayH5Controller.class.php b/Application/Sdk/Controller/PayH5Controller.class.php
index 6dfa05cc..7f3df8ed 100644
--- a/Application/Sdk/Controller/PayH5Controller.class.php
+++ b/Application/Sdk/Controller/PayH5Controller.class.php
@@ -23,35 +23,31 @@ class PayH5Controller extends BaseController{
 		if (!$this->userId) {
 			$this->error("用户未登入");
 		}
-		$request['user_id'] = $this->userId;
+		$user_id = $this->userId;
 		$game_id = I('request.game_id');
 		
 		// 支付验证 是否让支付
 		$payCheck = pay_check($this->userId);
 		if (!$payCheck['code']) {
 			redirect(U('Spend/notice',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>$payCheck['msg'], 'user_token' => $this->userToken)));exit;
-			
-// 			echo json_encode(['code'=>0,'msg'=> $payCheck['msg']]);exit;
 		}
 		
-		$pay_order_number = I('request.pay_order_number', 0);
-		if ($pay_order_number) {
-			$payOrder = M("deposit", "tab_")->where(['pay_order_number' => $pay_order_number])->find();
-			if ($payOrder['pay_status'] == 1) {
-				$this->success("充值成功", "/sdk.php/");
-			}
-			$pay_order_number = $payOrder['pay_amount'];
-			$request['pay_order_number'] = $pay_order_number;
-			$price = $payOrder['pay_amount'];
-		} else {
-			$price = I('request.price');
-			$request['price'] = $price;
-			$request['pay_order_number'] = 'PF_'.date('Ymd').date('His').sp_random_string(4);
+		$request['user_id'] = $user_id;
+		$request['price'] = I('request.price');
+		$pay_info = M('pay_info', 'tab_')->where([
+			'user_id' => $user_id,
+			'game_id' => $game_id,
+			'type' => 'platform_pay',
+		])->order('id desc')->find();
+		if ($pay_info['price'] != $request['price']) {
+			jsonOutput(0, "充值金额有误..");
 		}
+		$price = $request['price'];
 		$price = round($price, 2);
 		if($price <= 0){
 			redirect(U('Spend/notice',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'充值金额有误', 'user_token' => $this->userToken)));exit;
 		}
+		$request['pay_order_number'] = $pay_info['order_id'];
 		
 		if(get_zfb_type()==0){ // 支付宝官方
 			if(C('alipay.way')==1/*  || ($request['is_create_ordernumer']==1 && C('alipay.way')==0) */){ /* wap */
@@ -522,6 +518,8 @@ class PayH5Controller extends BaseController{
         $table  = $param['code'] == 1 ? "spend" : "deposit";
         $prefix = $param['code'] == 1 ? "SP_" : "PF_";
         $out_trade_no = $prefix.date('Ymd').date('His').sp_random_string(4);
+        if ($param['pay_order_number']) $out_trade_no = $param['pay_order_number'];
+        
         $user = get_user_entity($param['user_id']);
         switch ($param['apitype']) {
             case 'swiftpass':
@@ -601,12 +599,21 @@ ADD COLUMN `pay_url`  text NULL AFTER `check_sign`;
             //redirect(U('Spend/notice',array('user_id'=>$user_id, 'is_platform' => 1, 'msg'=>'充值金额有误', 'game_id' => $game_id, 'user_token' => $this->userToken)));exit;
         }
         
+        $pay_info = M('pay_info', 'tab_')->where([
+        	'user_id' => $user_id,
+        	'game_id' => $game_id,
+        	'type' => 'platform_pay',
+        ])->order('id desc')->find();
+        if ($pay_info['price'] != $request['price']) {
+        	jsonOutput(0, "充值金额有误..");
+        }
+        
         $pay_amount = $request['price'];
         $prefix = "PF_";
         $request['pay_way'] = C("PAY_WAY.WEIXIN");
         $request['pay_status'] = 0;
         $request['spend_ip'] = get_client_ip();
-        $request['pay_order_number'] = 'PF_'.date('Ymd').date('His').sp_random_string(4);
+        $request['pay_order_number'] = $pay_info['order_id']; //'PF_'.date('Ymd').date('His').sp_random_string(4);
         $request['sdk_version'] = I('request.sdk_version');
         
         //0 官方 1威富通  2俊付通
diff --git a/Application/Sdk/View/default/Spend/pay_way.html b/Application/Sdk/View/default/Spend/pay_way.html
index cf10a90a..f46d4009 100644
--- a/Application/Sdk/View/default/Spend/pay_way.html
+++ b/Application/Sdk/View/default/Spend/pay_way.html
@@ -213,14 +213,13 @@
         </div>
         <!---微信支付存在时有更多支付出现-->
         <if condition="$pay_price elt C('WX_PAY_LIMIT')">
-            <if condition="C('wei_xin.status') eq 1 or C('weixin_gf.status') eq 1 or (C('goldpig.status') eq 1 and C('goldpig.wx') eq 1) or (C('heepay.status') eq 1 and C('heepay.wxp') eq 1) or (C('sqpay.status') eq 1 and C('sqpay.wx_small') eq 1)">
+            <if condition="C('wei_xin.status') eq 1 or C('weixin_gf.status') eq 1 or (C('goldpig.status') eq 1 and C('goldpig.wx') eq 1) or (C('heepay.status') eq 1) or (C('sqpay.status') eq 1 and C('sqpay.wx_small') eq 1)">
                 <div class="showotherpay weui-cells"> 
                     其他支付方式
                 </div>
             </if>
         </if>
 		 
-	
     </div>
 	<botton id="platform_pay" class="bottombutton">
         确认支付