Merge branch '1211' into dev

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(

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_id'] = $request['promote_id'];
-        $data['promote_account'] = get_promote_account($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) {