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
Your Name 5 years ago
parent aa32624641 549db73b2e
commit bb12d49b0d
4 changed files with 49 additions and 22 deletions
Show Stats Download Patch File Download Diff File

30
Application/Callback/Controller/BaseController.class.php
Unescape Escape View File

@ -107,8 +107,34 @@ class BaseController extends Controller {
'id' => $d['user_id'],
))->getField('balance');
if ($balance < $mbalance) { // 异常
$this->record_logs($mbalance."平台币余额不足".$balance);return false;
if ($balance < $mbalance) { // 异常 用户充值支付宝不支付 然后重新发起一笔订单支付 在回到支付宝找未支付订单支付 这种情况 加到平台币
$this->record_logs($mbalance."平台币余额不足--》用户充值支付宝不支付 然后重新发起一笔订单支付 在回到支付宝找未支付订单支付 这种情况 加到平台币".$balance);
$depositId = M('deposit',"tab_")->add([
'order_number' => $data['trade_no'],
'pay_order_number' => 'PF_'.$data['out_trade_no'],
'user_id' => $d['user_id'],
'user_account' => $d['user_account'],
'promote_id' => $d['promote_id'],
'promote_account' => $d['promote_account'],
'pay_amount' => $d['pay_amount'],
'pay_status' => 1,
'pay_way' => $d['pay_way'],
'pay_source' => 2, // 0官网 1推广后台 2移动端
'pay_ip' => $d['spend_ip'],
'create_time' => time(),
'sdk_version' => $d['sdk_version'],
'check_sign' => get_check_sign($d['user_id'],$data['trade_no'],$d['pay_amount'],$d['create_time']),
]);
$user = M("user","tab_");
$user->where("id=".$d['user_id'])->setInc("balance", $d['pay_amount']);
$user->where("id=".$d['user_id'])->setInc("cumulative", $d['pay_amount']);
//APP邀请好友消费奖励平台币
$this->inviteFriendAward($d['user_id'], $d['pay_amount'], 'PF_'.$data['out_trade_no']);
//充值奖励积分
$this->rechargeAwardPoint($d['user_id'],$d['pay_amount']);
return false;
}
M('user', 'tab_')->where(array(
'id' => $d['user_id']

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

@ -68,7 +68,7 @@ class PayH5Controller extends BaseController{
//$request['callback'] = 'http://'.$_SERVER['HTTP_HOST']. "/sdk.php/Spend/pay_success/orderno/".$request['pay_order_number'].'/game_id/'.$request['game_id'];
//$request['notifyurl'] = 'http://'.$_SERVER['HTTP_HOST']. "/callback.php/Notify/notify/apitype/alipay/method/notify";
$pay_url=$this->pay($request);
$request['pay_url'] = $pay_url['url'];
$request['pay_url'] = $pay_url['url']."&tx_client=hideopen";;
$orderno = $pay_url['out_trade_no'];
//echo $pay_url['url'];die;
// redirect($pay_url['url']);
@ -326,7 +326,7 @@ class PayH5Controller extends BaseController{
//$request['notifyurl'] = 'http://'.$_SERVER['HTTP_HOST']. "/callback.php/Notify/notify/apitype/alipay/method/notify";
$pay_url=$this->pay($request);
$request['pay_url'] = $pay_url['url'];
$request['pay_url'] = $pay_url['url']."&tx_client=hideopen";
$orderno = $pay_url['out_trade_no'];
// pp($request['pay_url']); todo: 又问提 死循环。。。
//echo json_encode(['code'=>200,'msg'=>'','data'=>['url'=>$pay_url['url'],'wap'=>1]]);exit;

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

@ -178,6 +178,17 @@
</div>
</a>
</if>
<if condition="$pay_price elt C('WX_PAY_LIMIT')">
<if condition="C('wei_xin.status') eq 1 or C('weixin_gf.status') eq 1 or (C('goldpig.status') eq 1 and C('goldpig.wx') eq 1) or (C('heepay.status') eq 1 and C('heepay.wxp') eq 1) or (C('sqpay.status') eq 1 and C('sqpay.wx_small') eq 1)">
<a id="wxpay" class="weui-cell" data-url="{:U('PayH5/weixin_pay',array('user_id'=>I('user_id'),'game_id'=>I('game_id'),'user_token'=>I('user_token')))}" class="recharge_way_btn recharge_way_btn_wechat">
<div class="weui-cell__hd"><img src="__IMG__/wxpay.png"></div>
<div class="weui-cell__bd">
<p style="color: #292929;font-size:.28rem;">微信支付</p>
<p style="color: #a9a9a9;font-size:.2rem;">推荐微信用户使用</p>
</div>
</a>
</if>
</if>
<if condition="C('sqpay.status') eq 1 and C('sqpay.shortcut') eq 1">
<a class="weui-cell" href="{:U('WapPay/wap_shortcut_pay', array('user_id'=>I('user_id'),'game_id'=>I('game_id'),'user_token'=>I('user_token')))}" class="recharge_way_btn recharge_way_btn_alipay">
<div class="weui-cell__hd"><img src="__IMG__/onlinepay.png"></div>
@ -197,28 +208,18 @@
</a>
</if>
<if condition="$pay_price elt C('WX_PAY_LIMIT')">
<if condition="C('wei_xin.status') eq 1 or C('weixin_gf.status') eq 1 or (C('goldpig.status') eq 1 and C('goldpig.wx') eq 1) or (C('heepay.status') eq 1 and C('heepay.wxp') eq 1) or (C('sqpay.status') eq 1 and C('sqpay.wx_small') eq 1)">
<a id="wxpay" style="display: none;" class="weui-cell" data-url="{:U('PayH5/weixin_pay',array('user_id'=>I('user_id'),'game_id'=>I('game_id'),'user_token'=>I('user_token')))}" class="recharge_way_btn recharge_way_btn_wechat">
<div class="weui-cell__hd"><img src="__IMG__/wxpay.png"></div>
<div class="weui-cell__bd">
<p style="color: #292929;font-size:.28rem;">微信支付</p>
<p style="color: #a9a9a9;font-size:.2rem;">推荐微信用户使用</p>
</div>
</a>
</if>
</if>
</div>
</div>
<!---微信支付存在时有更多支付出现-->
<if condition="$pay_price elt C('WX_PAY_LIMIT')">
<!-- <if condition="$pay_price elt C('WX_PAY_LIMIT')">
<if condition="C('wei_xin.status') eq 1 or C('weixin_gf.status') eq 1 or (C('goldpig.status') eq 1 and C('goldpig.wx') eq 1) or (C('heepay.status') eq 1 and C('heepay.wxp') eq 1) or (C('sqpay.status') eq 1 and C('sqpay.wx_small') eq 1)">
<div class="showotherpay weui-cells">
其他支付方式
</div>
</if>
</if>
</if> -->
</div>
@ -279,10 +280,10 @@ $(function() {
$(".paylist").show();
$(".showotherpay").show();
}
$(".showotherpay").on("click",function(){
$("#wxpay").show();
$(this).hide();
})
// $(".showotherpay").on("click",function(){
// $("#wxpay").show();
// $(this).hide();
// })
$("#platform_pay").click(function() {
var url = "{:U('PayH5/platform_coin_deduction',array('user_id'=>I('user_id'),'game_id'=>I('game_id'),'user_token'=>I('user_token')))}";

2
Application/Sdk/View/default/UserH/platform_pay_show.html
Unescape Escape View File

@ -49,7 +49,7 @@
</div>
</div>
<div class="btnbox">
<button id="pay" class="ptbbtn" type="button">去支付</button>
<button id="pay" class="ptbbtn" type="button" style="border: 0px;">去支付</button>
</div>
</form>

Write Preview
Loading…
Cancel
Save