From e9becdb9c9823345b4515b3ea34fab66392bd367 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Fri, 22 Nov 2019 20:54:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=BF=9D=E8=A7=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Callback/Controller/BaseController.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Application/Callback/Controller/BaseController.class.php b/Application/Callback/Controller/BaseController.class.php index 6960ab81..3ea12b5f 100644 --- a/Application/Callback/Controller/BaseController.class.php +++ b/Application/Callback/Controller/BaseController.class.php @@ -80,6 +80,7 @@ class BaseController extends Controller { if ($balance+$bind_balance < $d['deduction_amount']) { // 异常 用户充值支付宝不支付 然后重新发起一笔订单支付 在回到支付宝找未支付订单支付 这种情况 加到平台币 $this->record_logs($mbalance."平台币余额不足--》用户充值支付宝不支付 然后重新发起一笔订单支付 在回到支付宝找未支付订单支付 这种情况 加到平台币".$balance); + $createTime = time(); $depositId = M('deposit',"tab_")->add([ 'order_number' => $data['trade_no'], 'pay_order_number' => 'PF_'.$data['out_trade_no'], @@ -93,9 +94,9 @@ class BaseController extends Controller { 'pay_way' => $d['pay_way'], 'pay_source' => 2, // 0官网 1推广后台 2移动端 'pay_ip' => $d['spend_ip'], - 'create_time' => time(), + 'create_time' => $createTime, 'sdk_version' => $d['sdk_version'], - 'check_sign' => get_check_sign($d['user_id'],$data['trade_no'],$d['pay_amount'],$d['create_time']), + 'check_sign' => get_check_sign($d['user_id'],$data['trade_no'],$d['pay_amount'],$createTime), ]); $user = M("user","tab_"); $user->where("id=".$d['user_id'])->setInc("balance", $d['pay_amount']); From 8e2ce1b8b8439cd6969df1bc40e22a175eb9bbc0 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Mon, 25 Nov 2019 11:45:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?retuan=5Fage=20=E6=B3=A8=E9=87=8A=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Sdk/Controller/UserController.class.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Application/Sdk/Controller/UserController.class.php b/Application/Sdk/Controller/UserController.class.php index 9da65e34..2ee51eb0 100644 --- a/Application/Sdk/Controller/UserController.class.php +++ b/Application/Sdk/Controller/UserController.class.php @@ -1971,10 +1971,9 @@ class UserController extends BaseController $request = json_decode(base64_decode(file_get_contents("php://input")), true); if (empty($request)) { - $this -> set_message(1001, "fail", "操作数据不能为空"); - } + $mmm['account'] = $request['account']; $user = M('User', 'tab_') -> where($mmm) -> find(); //添加登录记录 @@ -2002,17 +2001,17 @@ class UserController extends BaseController $denglu = $uloginrecord['id']; } $data = C('age_prevent') == '' ? 0 : C('age_prevent'); //为空转换成1; - $data['on-off'] = $data['bat'] == '' ? 0 : $data['bat']; - $data['contents_off'] = C('age.contents_off'); - $data['auth'] = C('age') == '' ? 0 : C('age.status'); - $data['is_mandatory'] = C('age') == '' ? 0 : C('age.is_mandatory'); + $data['on-off'] = $data['bat'] == '' ? 0 : $data['bat']; // 防沉迷 0 开 1 关 + $data['contents_off'] = C('age.contents_off'); // 防沉迷提示内容 + $data['auth'] = C('age') == '' ? 0 : C('age.status'); // 实名认证开关 + $data['is_mandatory'] = C('age') == '' ? 0 : C('age.is_mandatory'); // 是否强制认证 0强制 1不强制 unset($data['status']); $res['date'] = $data; $where['id'] = $request['user_id']; $re = M('User', 'tab_') -> field('age_status') -> where($where) -> find(); if ($re) { - $data['age_status'] = $re['age_status']; + $data['age_status'] = $re['age_status']; // 用户实名认证状态 0未审核 1未通过 2成功 3未成年 } else {