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

Application/Sdk/Controller/AppleController.class.php

@@ -9,6 +9,7 @@ use Org\GoldPig\GoldPig;
 use Org\SqpaySDK\Sqpay;
 use Org\HeepaySDK\Heepay;
 use Qiniu\json_decode;
+use Think\Log;
 
 
 class AppleController extends BaseController{    
@@ -88,18 +89,20 @@ class AppleController extends BaseController{
     */
     public function apple_alipay_pay($user_id,$game_id){
         #获取SDK上POST方式传过来的数据 然后base64解密 然后将json字符串转化成数组
+        //echo json_encode(['code'=>0,'msg'=> $user_id."game:".$game_id]);exit;
         $file=file_get_contents("./Application/Sdk/OrderNo/".$user_id."-".$game_id.".txt");
         $request = json_decode(think_decrypt($file),true);
         C(api('Config/lists'));
        
-        /*$request['user_id'] = 1;
+        /*
+        $request['user_id'] = 1;
         $request['game_id'] = 1;
         $request['price'] = 1.01;
-        $request['extend'] = 21111183;
+        $request['extend'] = 21111184;
         $request['pay_order_number'] = 21111183;
         $request['sdk_version'] = 2;
         $request['code'] =1;
-        */
+*/
         if (empty($request)) {
 			echo json_encode(['code'=>0,'msg'=>'登录数据不能为空']);exit;
 		}
@@ -125,7 +128,7 @@ class AppleController extends BaseController{
 		$this->other_price($request);
 
         if(get_zfb_type()==0){ // 支付宝官方
-			if(C('alipay.way')==1 || ($request['is_create_ordernumer']==1 && C('alipay.way')==0)){/* wap */
+			if(C('alipay.way')==1 || ($request['is_create_ordernumer']==1 && C('alipay.way')==0)){ /* wap */
 
 	            $game_set_data = get_game_set_info($request['game_id']);
 	            $request['apitype'] = "alipay";
@@ -324,7 +327,8 @@ class AppleController extends BaseController{
             ->setGameId($param['game_id'])
             ->setGameName(get_game_name($param['game_id']))
             ->setGameAppid($param['game_appid'])
-            ->setServerId(0)
+            ->setServerId($param['server_id'])
+            ->setGameplayerId($param['game_player_id'])
             ->setCallback($param['callback'])
             ->setNotifyUrl($param['notifyurl'])
             ->setGameplayerName($param['game_player_name'])
@@ -354,6 +358,7 @@ class AppleController extends BaseController{
     {
         $file=file_get_contents("./Application/Sdk/OrderNo/".$user_id."-".$game_id.".txt");
         $request = json_decode(think_decrypt($file),true);
+//         Log::write("wxpay:".serialize($request));
         /*$request['user_id'] = 1;
         $request['game_id'] = 1;
         $request['price'] = 157.01;

Application/Sdk/Controller/ExchangeController.class.php

@@ -73,10 +73,7 @@ class ExchangeController extends BaseController{
 
             $request['spend_ip']   = get_client_ip();
 
-
             file_put_contents("./Application/Sdk/OrderNo/".$request['user_id']."-".$request['game_id'].".txt",think_encrypt(json_encode($request)));
-
-
             echo base64_encode(json_encode(array('status'=>200,'out_trade_no'=>$out_trade_no,'img'=>'http://' . $_SERVER ['HTTP_HOST'].'/sdk.php?s=/Spend/pay_way&user_id='.$request['user_id'].'&game_id='.$request['game_id'].'&type=1')));exit;
 
         } else {
@@ -106,9 +103,9 @@ class ExchangeController extends BaseController{
 
 
                             file_put_contents("./Application/Sdk/OrderNo/".$request['user_id']."-".$request['game_id'].".txt",think_encrypt(json_encode($request)));
-
                             echo base64_encode(json_encode(array('status'=>200,'out_trade_no'=>$out_trade_no,'img'=>'http://' . $_SERVER ['HTTP_HOST'].'/sdk.php?s=/Spend/pay_way&user_id='.$request['user_id'].'&game_id='.$request['game_id'].'&type=1')));exit;
 
+
 			}elseif(!get_game_appstatus2($request['game_id'])&&$request['is_create_ordernumer']==1){ /* 苹果支付 */
 
 						#获取订单信息

Application/Sdk/Controller/WapPayController.class.php

@@ -41,7 +41,8 @@ class WapPayController extends BaseController{
             ->setGameId($param['game_id']) 
             ->setGameName(get_game_name($param['game_id'])) 
             ->setGameAppid($param['game_appid']) 
-            ->setServerId(0) 
+            ->setServerId($param['server_id']) 
+            ->setGamePlayerId($param['game_player_id'])
             ->setGameplayerName($param['game_player_name']) 
             ->setServerName($param['server_name']) 
             ->setUserId($param['user_id']) 
@@ -634,10 +635,9 @@ class WapPayController extends BaseController{
                 $json_data['status'] = 500; 
                 $json_data['url']    = "http://" . $_SERVER['HTTP_HOST']; 
             } 
-                $json_data['cal_url']    = C("pay_header"); 
-
-                  echo base64_encode(json_encode($json_data));exit; 
-            // $this->redirect('WapPay/weixin_pay_view',['user_id'=>$request['user_id'],'game_id'=>$request['game_id']]); 
+                $json_data['cal_url']    = $_SERVER ['HTTP_HOST'];
+                echo base64_encode(json_encode($json_data));exit;
+                // $this->redirect('WapPay/weixin_pay_view',['user_id'=>$request['user_id'],'game_id'=>$request['game_id']]);
         } else if(get_wx_pay_type() == 1){  // 威富通
             if( empty(C('heepay.partner'))||empty(C('heepay.key'))){ 
                 $this->set_message(1009, "fail", "支付参数未配置"); 

ThinkPHP/Library/Think/Pay.class.php

@@ -313,6 +313,7 @@ class Pay
         $spend_data['game_name'] = $vo->getGameName();
         $spend_data['server_id'] = $vo->getServerId();
         $spend_data['server_name'] = $vo->getServerName();
+        $spend_data['game_player_id'] = $vo->getGameplayerId();
         $spend_data['game_player_name'] = $vo->getGameplayerName();
         $spend_data['promote_id'] = $vo->getPromoteId();
         $spend_data['promote_account'] = $vo->getPromoteName();

ThinkPHP/Library/Think/Pay/PayVo.class.php

@@ -24,6 +24,7 @@ class PayVo {
     protected $_serverid;
     protected $_serverName;
     protected $_gameplayerName;
+    protected $_gameplayerId;
     protected $_userid;
     protected $_account;
     protected $_userNickName;
@@ -60,6 +61,12 @@ class PayVo {
         return $this;
     }
     
+    // 设置游戏玩家ID
+    public function setGameplayerId($gameplayerId) {
+    	$this->_gameplayerId = $gameplayerId;
+    	return $this;
+    }
+
    //退款批次号
     public function setBatchNo($batchno) {
         $this->_batchno = $batchno;
@@ -446,6 +453,14 @@ class PayVo {
         return $this->_gameid;
     }
     
+    /**
+     * 获取角色id
+     * @return type
+     */
+    public function getGameplayerId() {
+    	return $this->_gameplayerId;
+    }
+
     /**
      * 获取游戏名称
      * @return type