From bf8bf6a54b7bc7dd3904004f738972a4acfa1aa3 Mon Sep 17 00:00:00 2001
From: tpingzhang <635929049@qq.com>
Date: Wed, 11 Dec 2019 15:33:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=20=E6=8A=B5=E6=89=A3?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=20=E4=BF=9D=E5=AD=98=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=A7=92=E8=89=B2=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Common/Api/GameApi.class.php            | 4 ++++
 Application/Sdk/Controller/UserController.class.php | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Application/Common/Api/GameApi.class.php b/Application/Common/Api/GameApi.class.php
index e404defe..fdc43dca 100644
--- a/Application/Common/Api/GameApi.class.php
+++ b/Application/Common/Api/GameApi.class.php
@@ -42,6 +42,10 @@ class GameApi {
 
 		if(empty($game_data)){ $this->error_record("未找到指定游戏数据"); return false;}
 		if(empty($game_data['pay_notify_url'])){$this->error_record("未设置游戏支付通知地址"); return false;}
+		// 通知  抵扣的情况
+		if (isset($pay_data['deduction_amount']) && $pay_data['deduction_amount'] > 0) {
+			$pay_data['cost'] += $pay_data['deduction_amount'];
+		}
 		$md5_sign = md5($pay_data['pay_order_number'].$pay_data['cost']."1".$pay_data['extend'].$game_data['game_key']);
 
 		$data = array(
diff --git a/Application/Sdk/Controller/UserController.class.php b/Application/Sdk/Controller/UserController.class.php
index f0b7aa54..dc3902d6 100644
--- a/Application/Sdk/Controller/UserController.class.php
+++ b/Application/Sdk/Controller/UserController.class.php
@@ -1256,8 +1256,8 @@ class UserController extends BaseController
         $user_data = $user -> find($user_id);
         
         $gameName = get_game_name($request['game_id']);
-        $data['promote_id'] = $request['promote_id'];
-        $data['promote_account'] = get_promote_account($request['promote_id']);
+        //$data['promote_id'] = $request['promote_id'];
+        //$data['promote_account'] = get_promote_account($request['promote_id']);
         $data['game_id'] = $request['game_id'];
         $data['game_name'] = $gameName;
         $data['server_id'] = $request['server_id'];
@@ -1284,6 +1284,8 @@ class UserController extends BaseController
             // $data['create_device_number'] = time();
 			// 修改重复插入问题  增加唯一索引  记录重复插入异常
             try {
+            	$data['promote_id'] = $user_data['promote_id'];
+            	$data['promote_account'] = $user_data['promote_account'];
             	$user_play->add($data);
             	$this -> set_message(200, "success", $user_play->_sql());
             } catch (\Exception $e) {