elf
/
cf-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
隐藏客服、苹果内购包支付
master
张谷诚 5 years ago committed by Gogs
parent 136b2e41cb 7d7d542952
commit 8bd2368321
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File

16
Application/Sdk/Controller/ExchangeController.class.php
Unescape Escape View File

@ -760,7 +760,7 @@ class ExchangeController extends BaseController{
} }
$field = array("pay_status"=>1,"pay_amount"=>$request['price'],"receipt"=>$data,"order_number"=>$info['receipt']['transaction_id']); $field = array("pay_status"=>0,"pay_amount"=>$request['price'],"receipt"=>$data,"order_number"=>$info['receipt']['transaction_id']);
$field['payed_time'] = time(); $field['payed_time'] = time();
switch ($pay_where) { switch ($pay_where) {
@ -769,7 +769,7 @@ class ExchangeController extends BaseController{
$result = M('spend','tab_')->where($map)->setField($field); $result = M('spend','tab_')->where($map)->setField($field);
if ($result) { if ($result) {
// 通知后台 // 通知后台
try { /* try {
$url = C('TASK_URL')."/game-event/recharge"; $url = C('TASK_URL')."/game-event/recharge";
post_async($url, [ post_async($url, [
'form_params' => [ 'form_params' => [
@ -778,7 +778,7 @@ class ExchangeController extends BaseController{
]); ]);
} catch(\Exception $e) { } catch(\Exception $e) {
} } */
} }
$param['out_trade_no'] = $out_trade_no; $param['out_trade_no'] = $out_trade_no;
@ -787,14 +787,14 @@ class ExchangeController extends BaseController{
if (isset($request['app_type']) && $request['app_type'] == 2) { if (isset($request['app_type']) && $request['app_type'] == 2) {
$isBeta = true; $isBeta = true;
// 美国IP 贝塔版 // 美国IP 贝塔版
$ip = get_client_ip(); // $ip = get_client_ip();
$isUSBeta = ip_is_country($ip); // $isUSBeta = ip_is_country($ip);
} }
$game = new GameApi(); $game = new GameApi();
//判断是否开启苹果内购支付通知 //判断是否开启苹果内购支付通知
if ($isBeta && $isUSBeta) { if ($isBeta /* && $isUSBeta */) {
$is_white_list = M('forbit_ip', 'tab_')->where(['user_id'=>$payamountVerify['user_id'],'status'=>1])->find(); $is_white_list = M('forbit_ip', 'tab_')->where(['user_id'=>$payamountVerify['user_id'],'status'=>1])->find();
@ -803,7 +803,7 @@ class ExchangeController extends BaseController{
} }
} else { } else {
$game->game_pay_notify($param); // $game->game_pay_notify($param);
} }
break; break;
@ -830,7 +830,7 @@ class ExchangeController extends BaseController{
if($result){ if($result){
$this->set_ratio($out_trade_no); // $this->set_ratio($out_trade_no);
echo base64_encode(json_encode(array("status"=>200,"return_code"=>"success","return_msg"=>"支付成功"))); echo base64_encode(json_encode(array("status"=>200,"return_code"=>"success","return_msg"=>"支付成功")));

1
Application/Sdk/Controller/GameController.class.php
Unescape Escape View File

@ -78,6 +78,7 @@ class GameController extends BaseController{
// 魔幻游戏 隐藏客服 // 魔幻游戏 隐藏客服
if ($data['game_id'] == 197 || $data['game_id'] == 198 if ($data['game_id'] == 197 || $data['game_id'] == 198
|| $data['game_id'] == 201 || $data['game_id'] == 202 // 马踏乱世 || $data['game_id'] == 201 || $data['game_id'] == 202 // 马踏乱世
|| $data['game_id'] == 211 || $data['game_id'] == 212 // 盛世龙城
) { ) {
// android // android
$contact_cs[$k]['act'] = ""; $contact_cs[$k]['act'] = "";

4
Application/Sdk/Controller/NoticeController.class.php
Unescape Escape View File

@ -410,7 +410,9 @@ class NoticeController extends BaseController{
$data['APP_EMAIL'] = C('APP_EMAIL'); $data['APP_EMAIL'] = C('APP_EMAIL');
// 魔幻游戏 隐藏客服 // 魔幻游戏 隐藏客服
if ($request['game_id'] == 197 || $request['game_id'] == 198 if ($request['game_id'] == 197 || $request['game_id'] == 198
|| $request['game_id'] == 201 || $request['game_id'] == 202) { // 马踏乱世 || $request['game_id'] == 201 || $request['game_id'] == 202 // 马踏乱世
|| $request['game_id'] == 211 || $request['game_id'] == 212 // 盛世龙城
) {
$data['APP_QQ'] = ""; $data['APP_QQ'] = "";
} }
$this->new_set_message(200,"成功",$data); $this->new_set_message(200,"成功",$data);

Write Preview
Loading…
Cancel
Save