From 5c6e8eabcdc4dbfffe306d77ed52550580ca0ba6 Mon Sep 17 00:00:00 2001
From: tpingzhang <635929049@qq.com>
Date: Wed, 18 Dec 2019 19:33:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sdk/Controller/WapPayController.class.php | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/Application/Sdk/Controller/WapPayController.class.php b/Application/Sdk/Controller/WapPayController.class.php
index 2c044d78..fc931643 100644
--- a/Application/Sdk/Controller/WapPayController.class.php
+++ b/Application/Sdk/Controller/WapPayController.class.php
@@ -611,12 +611,6 @@ class WapPayController extends BaseController{
     	
     	
     	$userToken = I('request.user_token');
-    	/* $request['user_id'] = 232;
-    	$request['game_id'] = 78;
-    	$request['price'] = 0.02;
-    	$request['code'] = 1;
-    	$request['extend'] = "SP_522992339581";
-    	$request['pay_order_number'] = "SP_24522992339581";   */
     
     	if (empty($request)) {
     		redirect(U('Spend/notice',array('user_id'=>$user_id,'game_id'=>$game_id,'is_platform'=> $is_platform,'msg'=>'登录数据不能为空', 'user_token' => $userToken)));exit;
@@ -634,7 +628,6 @@ class WapPayController extends BaseController{
     	if($request['price']*1<=0){
     		redirect(U('Spend/notice',array('user_id'=>$user_id,'game_id'=>$game_id,'is_platform'=> $is_platform,'msg'=>'充值金额有误', 'user_token' => $userToken)));exit;
     	}
-    
     	
     	C(api('Config/lists'));
     
@@ -659,6 +652,9 @@ class WapPayController extends BaseController{
     		$this->other_price($request, $request['price']-$pay_amount);
     	}
     	
+    	$user_entity = get_user_entity($request['user_id']);
+    	$game_name = isset($request['game_name']) ? $request['game_name'] : M('game', 'tab_')->where(['id' => $request['game_id']])->getField('game_name');
+    	
     	// 平台币充值
     	if ($is_platform) {
     		$request['code'] = 0;
@@ -675,12 +671,22 @@ class WapPayController extends BaseController{
     				'user_id' => $request['user_id'],
     				'game_id' => $request['game_id'],
     				'order_id' => $request['pay_order_number'],
-    				'extend' => $request['pay_order_number'],
+    				'extend' => '',
     				'price' => $request['price'],
     				'type' => 'sq_shortcut_platform',   // 平台币充值
     				'info' => json_encode($request),
     				'status' => 'normal',
     				'create_time' => time(),
+    				'user_account' => $user_entity['account'],
+    				'game_player_name' => '',
+    				'game_name' => $game_name,
+    				'server_id' => 0,  // 旧包平台充值 没传
+    				'server_name' => '',
+    				'promote_id' => $user_entity['promote_id'],
+					'game_player_id' => '',
+					'sdk_version' => isset($request['sdk_version']) ? $request['sdk_version'] : 0,
+					'promote_account' => $user_entity['promote_account'],
+    				'ip' => get_client_ip(),
     		));
     		if (!$ret) {
     			return ;
@@ -703,7 +709,7 @@ class WapPayController extends BaseController{
     				'id' => $payInfo['id']
     			])->save([
     				'type' => 'sq_shortcut', // 游戏充值
-    				'order_id' => $request['pay_order_number'],
+//     				'order_id' => $request['pay_order_number'],
     				'price' => $request['actual_amount'] ? $request['actual_amount'] : $request['price'],
     				'info' => $infosave
     			]);
@@ -713,6 +719,7 @@ class WapPayController extends BaseController{
     			$request['pay_way'] = C("PAY_WAY.SQ_SHORTCUT");
     			$request['pay_status'] = 0;
     			$request['spend_ip'] = get_client_ip();
+    			$request['pay_order_number'] = $payInfo['order_id'];
     		}
     	}