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
zhanglingsheng 5 years ago
parent bdef7478f7 452c143843
commit 7d9cbda6c4
5 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File

26
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,7 +409,7 @@ 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);
}
@ -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;
}

8
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){
redirect(U('Spend/notice',array('user_id'=>$ordercheck['user_id'],'game_id'=>$ordercheck['game_id'],'msg'=>'订单已经存在，请刷新充值页面重新下单！')));exit;
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',"订单已经存在，请刷新充值页面重新下单！");
}

6
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";
$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) {

38
Application/Sdk/View/default/Spend/pay_way.html
Unescape Escape View File

@ -28,7 +28,7 @@
}
.weui-cell {
height: 0.85rem;
height: 0.75rem;
font-size: .28rem;
color: #292929;
padding: 0px .3rem;
@ -66,12 +66,18 @@
height:1rem;background-color: #21B1EB;color: #ffffff;font-size: .32rem;text-align: center;line-height:1rem;bottom: 0px;
position: fixed;left: 0;right: 0;
}
.pay-info,.paylist{
margin-top: .3rem;
}
}
@media screen and (orientation: landscape) {
/*横屏 css*/
.box{
padding:.3rem .5rem;
padding:.24rem .5rem;
}
.pay-info,.paylist{
margin-top: .24rem;
}
.bottombutton{
height:1rem;background-color: #21B1EB;color: #ffffff;font-size: .32rem;text-align: center;line-height:1rem;
width: 7.5rem;border-radius: .2rem;position: absolute;left: 50%;margin: .5rem 0 .5rem -3.75rem;
@ -89,7 +95,7 @@
min-width: 30%;
box-sizing: content-box;
margin-left: 3%;
padding: .2rem .0rem;
padding: .16rem .0rem;
}
.paylist-box .weui-cell:before{
content: none;
@ -109,25 +115,7 @@
.showotherpay{
width: 100%;height: .9rem;background-color: #ffffff;font-size: .28rem;text-align: center;color: #A9A9A9;line-height: .9rem;margin-top: .3rem;
}
@media screen and (orientation: portrait) {
.box{
padding:.3rem;
}
}
@media screen and (orientation: landscape) {
/*横屏 css*/
.box{
padding:.3rem .5rem;
}
.bottombutton{
height:1rem;background-color: #21B1EB;color: #ffffff;font-size: .32rem;text-align: center;line-height:1rem;
width: 7.5rem;border-radius: .2rem;position: absolute;left: 50%;margin: .5rem 0 .5rem -3.75rem;
}
body{
padding-bottom: .50rem;
}
}
.noborder.weui-cell:before{
height: 0px;
border: 0px;
@ -155,7 +143,7 @@
<!-- <div class="weui-cell__ft" style="color: #A9A9A9;">{$balance+$bind_balance}平台币</div> -->
</div>
</div>
<div class="weui-cells" style="margin-top: .3rem;">
<div class="weui-cells pay-info">
<div class="weui-cell">
<div class="weui-cell__bd">
<p>适用平台余额:</p>
@ -169,8 +157,8 @@
<div data-pay_price="{$pay_price}" id="pay_price" class="weui-cell__ft" style="color: red">￥{$pay_price}</div>
</div>
</div>
<div class="weui-cells paylist" style="margin-top: .3rem;">
<div class="weui-cells__title" style="line-height: .85rem;color: #a9a9a9;font-size:.28rem;margin: 0px;">
<div class="weui-cells paylist">
<div class="weui-cells__title" style="line-height: .64rem;color: #a9a9a9;font-size:.24rem;margin: 0px;">
请选择支付方式</div>
<div class="border-half-line" style="position: absolute;"></div>
<div class="paylist-box">

2
Application/Sdk/View/default/WapPay/wap_shortcut_pay.html
Unescape Escape View File

@ -529,8 +529,8 @@
}
if(isok){
btnpay = true;
$("#wfform").submit();
Tip.loadShow();
$("#wfform").submit();
}
})

Write Preview
Loading…
Cancel
Save