From 0837f66f1caf93be07e5349d8a600ec7f45c9cdf Mon Sep 17 00:00:00 2001
From: tpingzhang <635929049@qq.com>
Date: Wed, 6 Nov 2019 19:21:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=85=85=E5=80=BC=E6=94=AF=E4=BB=98=E5=AE=9D=E4=B8=8D=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=20=20=E7=84=B6=E5=90=8E=E9=87=8D=E6=96=B0=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E4=B8=80=E7=AC=94=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=20=20=E5=9C=A8=E5=9B=9E=E5=88=B0=E6=94=AF=E4=BB=98=E5=AE=9D?=
 =?UTF-8?q?=E6=89=BE=E6=9C=AA=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=20=20=E8=BF=99=E7=A7=8D=E6=83=85=E5=86=B5=20=E5=8A=A0?=
 =?UTF-8?q?=E5=88=B0=E5=B9=B3=E5=8F=B0=E5=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/BaseController.class.php       | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

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']