Commit d59f0431 authored by clone's avatar clone

bug

parent 79234f17
...@@ -3,8 +3,10 @@ ...@@ -3,8 +3,10 @@
namespace app\api\controller; namespace app\api\controller;
use app\api\extend\Basic; use app\api\extend\Basic;
use app\api\service\RegisterService;
use app\api\untils\MessageUntils; use app\api\untils\MessageUntils;
use app\extra\RedisExt; use app\extra\RedisExt;
use app\model\Users;
use think\Request; use think\Request;
/** /**
...@@ -17,11 +19,15 @@ use think\Request; ...@@ -17,11 +19,15 @@ use think\Request;
class Register extends Basic class Register extends Basic
{ {
private $messageUntil; private $messageUntil;
private $userModel;
private $service_;
function __construct($request = null) function __construct($request = null)
{ {
parent::__construct($request); parent::__construct($request);
$this->messageUntil = new MessageUntils(); $this->messageUntil = new MessageUntils();
$this->userModel = new Users();
$this->service_ = new RegisterService();
} }
/** /**
...@@ -52,10 +58,12 @@ class Register extends Basic ...@@ -52,10 +58,12 @@ class Register extends Basic
{ {
$params = $this->params; $params = $this->params;
$params = array( $params = array(
"phone" => "16617616471", "phone" => "16617616471",
"device_id" => "1111", "device_id" => "1111",
"code" => 1231, "code" => 1231,
"wx_open_id" => "1111111111" //false "wx_union_id" => "1111111111", //false
"referrer_id" => 1, //邀请人id 经纪人or客户
"referrer_source" => 20, //false
); );
$checkResult = $this->validate($params, "RegisterValidate.register"); $checkResult = $this->validate($params, "RegisterValidate.register");
if (true !== $checkResult) { if (true !== $checkResult) {
...@@ -65,8 +73,12 @@ class Register extends Basic ...@@ -65,8 +73,12 @@ class Register extends Basic
if (!$is_eq) { if (!$is_eq) {
return $this->response("101", "验证码错误"); return $this->response("101", "验证码错误");
} }
$phone = $params["phone"];
$wx_union_id = $params["wx_union_id"];
$referrer_id = $params["referrer_id"];
$referrer_source = $params["referrer_source"];
$this->service_->userRegister($phone, $referrer_id, $referrer_source, $wx_union_id);
} }
} }
\ No newline at end of file
<?php
namespace app\api\service;
use app\model\Users;
/**
* Created by PhpStorm.
* User : zw
* Date : 2018/6/13
* Time : 17:10
* Intro:
*/
class RegisterService
{
private $userModel;
public function __construct()
{
$this->userModel = new Users();
}
public function userRegister($phone, $referrer_id, $referrer_source, $wx_union_id)
{
//todo 1.判断是否有此用户,包涵未激活或者冻结, 2.无此用户则注册,返回AuthToken ,3有则登录返回AuthToken
$conditions["user_phone"] = $phone;
$fields = "id,agent_id,referrer_id,referrer_source,user_phone,status";
$user_info = $this->userModel->getUserByWhere($conditions, $fields);
if (count($user_info) > 0) {
switch ($user_info[0]["status"]) {
case -1://激活
break;
case 0: //修改 绑定的微信
break;
case 1:
return '该账号已被冻结';
case 2://删除的账号该状态
default:
break;
}
}
}
}
\ No newline at end of file
...@@ -14,15 +14,15 @@ use think\Validate; ...@@ -14,15 +14,15 @@ use think\Validate;
class RegisterValidate extends Validate class RegisterValidate extends Validate
{ {
protected $rule = [ protected $rule = [
'wx_open_id' => 'require|length:10,50', 'wx_union_id' => 'require|length:10,50',
'code' => 'require|number', 'code' => 'require|number',
'device_id' => 'require', 'device_id' => 'require',
'phone' => [ 'regex' => '/^((13[0-9])|(14[0-9])|(15[0-9])|(18[0-9])|(16[0-9])|(17[0-9])|(19[0-9]))\\d{8}$/i' ], 'phone' => [ 'regex' => '/^((13[0-9])|(14[0-9])|(15[0-9])|(18[0-9])|(16[0-9])|(17[0-9])|(19[0-9]))\\d{8}$/i' ],
]; ];
protected $message = [ protected $message = [
'wx_open_id.require' => '微信open_id不能为空', 'wx_union_id.require' => '微信open_id不能为空',
'wx_open_id.length:10,50' => '微信open_id错误', 'wx_union_id.length:10,50' => '微信open_id错误',
'phone.regex' => '手机号格式不正确', 'phone.regex' => '手机号格式不正确',
'device_id.require' => '设备id不能为空', 'device_id.require' => '设备id不能为空',
'code.require' => 'code为必填字段', 'code.require' => 'code为必填字段',
...@@ -31,6 +31,6 @@ class RegisterValidate extends Validate ...@@ -31,6 +31,6 @@ class RegisterValidate extends Validate
protected $scene = [ protected $scene = [
'verify' => [ 'phone,device_id' ], 'verify' => [ 'phone,device_id' ],
'register' => [ 'phone,device_id,code,wx_open_id' ], 'register' => [ 'phone,device_id,code,wx_union_id' ],
]; ];
} }
\ No newline at end of file
...@@ -315,7 +315,7 @@ Route::group('api', [ ...@@ -315,7 +315,7 @@ Route::group('api', [
'getVersionNo' => [ 'api/Version/getVersionNo', [ 'method' => 'post|get' ] ], 'getVersionNo' => [ 'api/Version/getVersionNo', [ 'method' => 'post|get' ] ],
'saveWxInfo' => [ 'api/WxSdk/saveWxInfo', [ 'method' => 'POST|GET' ] ], //wx 'saveWxInfo' => [ 'api/WxSdk/saveWxInfo', [ 'method' => 'POST' ] ], //wx
'bindUserId' => [ 'api/WxSdk/bindUserId', [ 'method' => 'POST|GET' ] ], //wx 'bindUserId' => [ 'api/WxSdk/bindUserId', [ 'method' => 'POST|GET' ] ], //wx
'sendCode' => [ 'api/Register/registerSendCode', [ 'method' => 'POST' ] ], 'sendCode' => [ 'api/Register/registerSendCode', [ 'method' => 'POST' ] ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment