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

Merge branch 'dev' of 47.111.118.107:/srv/git/sdk into dev

Browse Source
master
chenzhi 5 years ago
parent 8894f49bab 3fba0a4ccb
commit 2f37d71f37
6 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File

28
Application/Sdk/Controller/AppleController.class.php
Unescape Escape View File

@ -124,7 +124,7 @@ class AppleController extends BaseController{
echo json_encode(['code'=>0,'msg'=>'订单号重复，请关闭支付页面重新支付']);exit;
}
$this->other_price($request);
// $this->other_price($request);
if(get_zfb_type()==0){ // 支付宝官方
if(C('alipay.way')==1/* || ($request['is_create_ordernumer']==1 && C('alipay.way')==0) */){ /* wap */
@ -171,7 +171,7 @@ class AppleController extends BaseController{
echo json_encode(['code'=>0,'msg'=>'订单已经存在，请刷新充值页面重新下单！','wap'=>1]);
exit;
}
$this->add_spend($request,1);
$this->add_spend($request,1, 0);
}else{
$this->add_deposit($request, 1);
}
@ -400,7 +400,7 @@ class AppleController extends BaseController{
$pay_amount = $discount * $request['price'] / 10;
// file_put_contents(dirname(__FILE__).'/1222222.txt',get_wx_pay_type());
// 绑币平台币优先处理
$this->other_price($request, $discountAmount);
// $this->other_price($request, $discountAmount);
//0 官方 1威富通 2俊付通
if (get_wx_pay_type() == 0) {
@ -409,9 +409,9 @@ class AppleController extends BaseController{
if($is_pay['status']==1){
if($request['code']==1){
$this->add_spend($request,1);
$this->add_spend($request,1, 0);
}else{
$this->add_deposit($request, 1);
$this->add_deposit($request, 1, 0);
}
$json_data['url'] = $is_pay['mweb_url'].'&redirect_url='.(is_ssl()?'https%3A%2F%2F':'http%3A%2F%2F'). $_SERVER ['HTTP_HOST'] . "%2Fsdk.php%2FSpend%2Fpay_success%2Forderno%2F".$request['pay_order_number'].'%2Fgame_id%2F'.$request['game_id'] ;
@ -638,30 +638,30 @@ class AppleController extends BaseController{
$code = $_POST['way'];
if (empty($request)) {
redirect(U('Spend/notice',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'参数错误')));exit;
redirect(U('Spend/notice_v1',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'参数错误')));exit;
}
// 支付验证 是否让支付
$payCheck = pay_check($request['user_id']);
if (!$payCheck['code']) {
redirect(U('Spend/notice',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=> $payCheck['msg'])));exit;
redirect(U('Spend/notice_v1',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=> $payCheck['msg'])));exit;
}
C(api('Config/lists'));
$user_info = get_user_entity($request['user_id']);
if($user_info['lock_status'] == 0 || $user_info['check_status'] == 0){
redirect(U('Spend/notice',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'账号被禁用,无法充值，请联系客服！')));exit;
redirect(U('Spend/notice_v1',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'账号被禁用,无法充值，请联系客服！')));exit;
}
$game = M('Game','tab_')->where(['id'=>$request['game_id']])->field('pay_status')->find();
if($game['pay_status'] == 0){
redirect(U('Spend/notice',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'该游戏暂时无法充值，请联系客服！')));exit;
redirect(U('Spend/notice_v1',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'该游戏暂时无法充值，请联系客服！')));exit;
}
if($request['price']*1<=0){
// $this->set_message(0,"fail","充值金额有误");
redirect(U('Spend/notice',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'充值金额有误')));exit;
redirect(U('Spend/notice_v1',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'充值金额有误')));exit;
}
$extend_data = M('spend','tab_')->where(array('extend'=>$request['extend'],'game_id'=>$request['game_id'],'pay_status'=>1))->find();
if($extend_data){
// $this->set_message(1089,"fail","订单号重复，请关闭支付页面重新支付");
redirect(U('Spend/notice',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'订单号重复，请关闭支付页面重新支付')));exit;
redirect(U('Spend/notice_v1',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'订单号重复，请关闭支付页面重新支付')));exit;
}
$out_trade_no = "PF_" . date('Ymd') . date('His') . sp_random_string(4);
$request['order_number'] = $out_trade_no;
@ -699,7 +699,7 @@ class AppleController extends BaseController{
$data = array('discount'=>$discount,"real_price"=>$real_price,'balance'=>$user_entity['balance']);
// $this->set_message(1076,"fail","余额不足");
redirect(U('Spend/notice',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'余额不足')));exit;
redirect(U('Spend/notice_v1',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'余额不足')));exit;
exit();
}
//防刷预警
@ -735,7 +735,7 @@ class AppleController extends BaseController{
if ($user_play_data['bind_balance'] < $request['price']) {
// $this->set_message(1076,"fail","余额不足");
redirect(U('Spend/notice',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'余额不足')));exit;
redirect(U('Spend/notice_v1',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'余额不足')));exit;
exit();
}
#扣除平台币
@ -747,7 +747,7 @@ class AppleController extends BaseController{
break;
default:
// $this->set_message(1081,"fail","支付方式不明确");
redirect(U('Spend/notice',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'支付方式不明确')));exit;
redirect(U('Spend/notice_v1',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'支付方式不明确')));exit;
exit();
break;
}

14
Application/Sdk/Controller/BaseController.class.php
Unescape Escape View File

@ -630,14 +630,18 @@ class BaseController extends RestController{
/**
*消费表添加数据
*/
public function add_spend($data,$type=0){
public function add_spend($data,$type=0,$api_ver=2){
$spend = M("spend","tab_");
$spend_data = $this->spend_param($data);
$ordercheck = $spend->where(array('pay_order_number'=>$spend_data["pay_order_number"]))->find();
if($ordercheck)
{
if($type==1){
if ($api_ver == 0) {
redirect(U('Spend/notice_v1',array('user_id'=>$ordercheck['user_id'],'game_id'=>$ordercheck['game_id'],'msg'=>'订单已经存在，请刷新充值页面重新下单！')));exit;
} else {
redirect(U('Spend/notice',array('user_id'=>$ordercheck['user_id'],'game_id'=>$ordercheck['game_id'],'msg'=>'订单已经存在，请刷新充值页面重新下单！')));exit;
}
}else{
$this->set_message(0,'fail',"订单已经存在，请刷新充值页面重新下单！");
}
@ -653,14 +657,20 @@ class BaseController extends RestController{
/*
*平台币充值记录
*/
public function add_deposit($data, $type=0){
public function add_deposit($data, $type=0,$api_ver=2){
$deposit = M("deposit","tab_");
$deposit_data = $this->deposit_param($data);
$ordercheck = $deposit->where(array('pay_order_number'=>$deposit_data["pay_order_number"]))->find();
if($ordercheck) {
if ($type) {
if ($api_ver == 0) {
redirect(U('Spend/notice_v1',array('user_id'=>$ordercheck['user_id'],'game_id'=>$ordercheck['game_id'],'msg'=>'订单已经存在，请刷新充值页面重新下单！')));
exit;
} else {
redirect(U('Spend/notice',array('user_id'=>$ordercheck['user_id'],'game_id'=>$ordercheck['game_id'],'msg'=>'订单已经存在，请刷新充值页面重新下单！')));
exit;
}
} else {
$this->set_message(0,'fail',"订单已经存在，请刷新充值页面重新下单！");
}

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

@ -35,7 +35,11 @@ class ExchangeController extends BaseController{
} else {
$payPage = "pay_way_v".$request['api_ver'];
} */
$payPage = "pay_way_v1";
if (isset($request['api_ver']) && $request['api_ver'] == 2) {
$payPage = "pay_way";
}
// 用户
$userToken = M('user', 'tab_')->where(['id' => $request['user_id']])->getField('user_token');
if (!$userToken) {

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

@ -167,9 +167,9 @@ class GameController extends BaseController{
$menus[$k]['icon'] = C('ADMIN_DOMAIN') . $menus[$k]['icon'];
// die;
if (substr($menus[$k]['url'], 0, 7) == "http://" || substr($menus[$k]['url'], 0, 8) == "https://") {
$menus[$k]['url'] = $menus[$k]['url'] . '/user_token/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'];
$menus[$k]['url'] = $menus[$k]['url'] . '/user_token/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'].'/api_ver/2';
} else {
$menus[$k]['url'] = C('H5_DOMAIN') . $v['url'] . '/user_token/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'];
$menus[$k]['url'] = C('H5_DOMAIN') . $v['url'] . '/user_token/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'].'/api_ver/2';
}
//$menus[$k]['url'] = C('H5_DOMAIN') . $v['url'] . '/user_token/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'];
if ($menus[$k]['type'] == 1) {// 原生
@ -194,9 +194,9 @@ class GameController extends BaseController{
$personalMenu[$k]['icon'] = C('ADMIN_DOMAIN') . $personalMenu[$k]['icon'];
// die;
if (substr($personalMenu[$k]['url'], 0, 7) == "http://" || substr($personalMenu[$k]['url'], 0, 8) == "https://") {
$personalMenu[$k]['url'] = $personalMenu[$k]['url'] . '/user_token/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'];
$personalMenu[$k]['url'] = $personalMenu[$k]['url'] . '/user_token/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'].'/api_ver/2';
} else {
$personalMenu[$k]['url'] = C('H5_DOMAIN') . $v['url'] . '/user_token/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'];
$personalMenu[$k]['url'] = C('H5_DOMAIN') . $v['url'] . '/user_token/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'].'/api_ver/2';
}
//$personalMenu[$k]['url'] = C('H5_DOMAIN') . $v['url'] . '/user_token/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'];
if ($personalMenu[$k]['type'] == 1) {// 原生

2
Application/Sdk/Controller/GameGiftPageController.class.php
Unescape Escape View File

@ -2,7 +2,7 @@
namespace Sdk\Controller;
use Think\Controller;
use Common\Api\GaemApi;
class GameGiftPageController extends BaseController{
class GameGiftPageController extends Controller{
public function gift_list(){
$gameId = I('game_id');

2
Application/Sdk/Controller/UserHController.class.php
Unescape Escape View File

@ -5,7 +5,7 @@ namespace Sdk\Controller;
use Think\Controller;
use Think\Log;
class UserHController extends BaseController
class UserHController extends Controller
{
/**
* 获取用户平台币充值记录绑币余额

Write Preview
Loading…
Cancel
Save