diff --git a/Application/Callback/Controller/BaseController.class.php b/Application/Callback/Controller/BaseController.class.php
index da186ceb..91b16c6f 100644
--- a/Application/Callback/Controller/BaseController.class.php
+++ b/Application/Callback/Controller/BaseController.class.php
@@ -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']
diff --git a/Application/Sdk/Controller/PayH5Controller.class.php b/Application/Sdk/Controller/PayH5Controller.class.php
index 1ebc32fb..c718e555 100644
--- a/Application/Sdk/Controller/PayH5Controller.class.php
+++ b/Application/Sdk/Controller/PayH5Controller.class.php
@@ -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;
diff --git a/Application/Sdk/View/default/Spend/pay_way.html b/Application/Sdk/View/default/Spend/pay_way.html
index d7e381f2..12a91414 100644
--- a/Application/Sdk/View/default/Spend/pay_way.html
+++ b/Application/Sdk/View/default/Spend/pay_way.html
@@ -178,6 +178,17 @@
+
+
+
+
+
+
+
+
@@ -197,28 +208,18 @@
-
-
-
-
-
-
-
-
+
-
+
@@ -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')))}";
diff --git a/Application/Sdk/View/default/UserH/platform_pay_show.html b/Application/Sdk/View/default/UserH/platform_pay_show.html
index b2026247..19e926c5 100644
--- a/Application/Sdk/View/default/UserH/platform_pay_show.html
+++ b/Application/Sdk/View/default/UserH/platform_pay_show.html
@@ -49,7 +49,7 @@
-
+