From cad01a4bccc078c53a7e4edd2918dfa82cb9a284 Mon Sep 17 00:00:00 2001
From: tping <tpingzhang11@126.com>
Date: Tue, 26 May 2020 17:29:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8B=B9=E6=9E=9C=E5=86=85=E8=B4=AD=20?=
 =?UTF-8?q?=E4=B8=8D=E5=88=A4=E6=96=AD=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=20=20=20=E6=AD=A3=E5=B8=B8=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?CP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Common/Api/GameApi.class.php              | 11 ++++++-----
 .../Sdk/Controller/ExchangeController.class.php       |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Application/Common/Api/GameApi.class.php b/Application/Common/Api/GameApi.class.php
index fdc43dca..796b401a 100644
--- a/Application/Common/Api/GameApi.class.php
+++ b/Application/Common/Api/GameApi.class.php
@@ -18,18 +18,19 @@ class GameApi {
 
 	}
 
-	public function game_pay_notify($param=null,$code=1,$is_uc=0){
+	public function game_pay_notify($param=null,$code=1,$is_uc=0, $isIosTest=0){
 		Log::write("notice:".serialize($param), Log::DEBUG);
-		$pay_map['pay_status'] = 1;
+		if (!$isIosTest) {  // 苹果内购 不判断订单支付成功   正常通知CP
+		  $pay_map['pay_status'] = 1;
+		}
 		$pay_map['pay_game_status'] = 0;
 		if($is_uc){
 			$uc=new Ucservice();
 			$pay_map['pay_order_number']=$param['out_trade_no'];
 			$pay_data=$uc->uc_spend_find($pay_map['pay_order_number']);
 		}else{
-			
-	            $pay_map['pay_order_number'] = $param['out_trade_no'];
-	            $pay_data = M("Spend","tab_")->where($pay_map)->find();
+            $pay_map['pay_order_number'] = $param['out_trade_no'];
+            $pay_data = M("Spend","tab_")->where($pay_map)->find();
 		}
 		
 		if(empty($pay_data)){
diff --git a/Application/Sdk/Controller/ExchangeController.class.php b/Application/Sdk/Controller/ExchangeController.class.php
index e700f9b5..27beda0a 100644
--- a/Application/Sdk/Controller/ExchangeController.class.php
+++ b/Application/Sdk/Controller/ExchangeController.class.php
@@ -799,7 +799,7 @@ class ExchangeController extends BaseController{
                             $is_white_list = M('forbit_ip', 'tab_')->where(['user_id'=>$payamountVerify['user_id'],'status'=>1])->find();
 
                             if ($is_white_list) {
-                                $game->game_pay_notify($param);
+                                $game->game_pay_notify($param, 1, 0, 1);
                             }
 
                         } else {