Merge branch 'dev' of 47.111.118.107:/srv/git/sdk into dev

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

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 {