Merge branch 'hotfix/shengshi_211_212' of wmtx/sdk into master

苹果内购 不判断订单支付成功   正常通知CP

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_map['pay_order_number'] = $param['out_trade_no'];
+            $pay_data = M("Spend","tab_")->where($pay_map)->find();
-	            $pay_data = M("Spend","tab_")->where($pay_map)->find();
 		}
 		
 		if(empty($pay_data)){

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 {