|
@@ -102,23 +102,23 @@ class MemberService extends BaseService
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 更新
|
|
// 更新
|
|
|
- if(!RedisService::get("caches:members:login_{$userId}")){
|
|
|
|
|
- $system = isset($params['system'])? $params['system'] : [];
|
|
|
|
|
- $system = $system && !is_array($system)? json_decode($system,true) : $system;
|
|
|
|
|
- $appSources = isset($system['app_sources']) && $system['app_sources']? $system['app_sources'] : 'ios';
|
|
|
|
|
- $uuid = isset($system['uuid'])? $system['uuid'] : '';
|
|
|
|
|
- $version = isset($system['app_version'])? $system['app_version'] : '';
|
|
|
|
|
|
|
+ if (!RedisService::get("caches:members:login_{$userId}")) {
|
|
|
|
|
+ $system = isset($params['system']) ? $params['system'] : [];
|
|
|
|
|
+ $system = $system && !is_array($system) ? json_decode($system, true) : $system;
|
|
|
|
|
+ $appSources = isset($system['app_sources']) && $system['app_sources'] ? $system['app_sources'] : 'ios';
|
|
|
|
|
+ $uuid = isset($system['uuid']) ? $system['uuid'] : '';
|
|
|
|
|
+ $version = isset($system['app_version']) ? $system['app_version'] : '';
|
|
|
$updateData = [
|
|
$updateData = [
|
|
|
- 'update_time'=> time(),
|
|
|
|
|
- 'login_ip'=> get_client_ip(),
|
|
|
|
|
- 'login_time'=> time(),
|
|
|
|
|
- 'device_code'=> $uuid,
|
|
|
|
|
- 'login_count'=> DB::raw("login_count+1"),
|
|
|
|
|
- 'app_version'=> $version,
|
|
|
|
|
- 'device'=> $appSources=='ios'? 1 : 2,
|
|
|
|
|
|
|
+ 'update_time' => time(),
|
|
|
|
|
+ 'login_ip' => get_client_ip(),
|
|
|
|
|
+ 'login_time' => time(),
|
|
|
|
|
+ 'device_code' => $uuid,
|
|
|
|
|
+ 'login_count' => DB::raw("login_count+1"),
|
|
|
|
|
+ 'app_version' => $version,
|
|
|
|
|
+ 'device' => $appSources == 'ios' ? 1 : 2,
|
|
|
];
|
|
];
|
|
|
- $this->model->where(['id'=> $userId])->update($updateData);
|
|
|
|
|
- RedisService::set("caches:members:login_{$userId}",$updateData, rand(300,600));
|
|
|
|
|
|
|
+ $this->model->where(['id' => $userId])->update($updateData);
|
|
|
|
|
+ RedisService::set("caches:members:login_{$userId}", $updateData, rand(300, 600));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -129,7 +129,7 @@ class MemberService extends BaseService
|
|
|
// 结果返回
|
|
// 结果返回
|
|
|
$result = [
|
|
$result = [
|
|
|
'access_token' => $token,
|
|
'access_token' => $token,
|
|
|
- 'info' => ['uid' => $userId,'nickname' => $data['nickname']],
|
|
|
|
|
|
|
+ 'info' => ['uid' => $userId, 'nickname' => $data['nickname']],
|
|
|
];
|
|
];
|
|
|
|
|
|
|
|
// 用户缓存信息
|
|
// 用户缓存信息
|
|
@@ -168,7 +168,7 @@ class MemberService extends BaseService
|
|
|
$this->error = MpService::make()->getError();
|
|
$this->error = MpService::make()->getError();
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
$userInfo = MpService::make()->getUserInfo($code);
|
|
$userInfo = MpService::make()->getUserInfo($code);
|
|
|
$openid = isset($userInfo['openid']) ? $userInfo['openid'] : '';
|
|
$openid = isset($userInfo['openid']) ? $userInfo['openid'] : '';
|
|
|
if (empty($userInfo)) {
|
|
if (empty($userInfo)) {
|
|
@@ -184,7 +184,7 @@ class MemberService extends BaseService
|
|
|
// 验证是否注册,没有则注册
|
|
// 验证是否注册,没有则注册
|
|
|
$where = ['mobile' => $phone];
|
|
$where = ['mobile' => $phone];
|
|
|
$data = $this->model->where($where)
|
|
$data = $this->model->where($where)
|
|
|
- ->select(['id', 'openid', 'mobile', 'user_type', 'nickname','avatar', 'code', 'status','mark'])
|
|
|
|
|
|
|
+ ->select(['id', 'openid', 'mobile', 'user_type', 'nickname', 'avatar', 'code', 'status', 'mark'])
|
|
|
->first();
|
|
->first();
|
|
|
$data = $data ? $data->toArray() : [];
|
|
$data = $data ? $data->toArray() : [];
|
|
|
$userId = isset($data['id']) ? $data['id'] : 0;
|
|
$userId = isset($data['id']) ? $data['id'] : 0;
|
|
@@ -192,7 +192,7 @@ class MemberService extends BaseService
|
|
|
$nickName = isset($data['nickname']) ? $data['nickname'] : '';
|
|
$nickName = isset($data['nickname']) ? $data['nickname'] : '';
|
|
|
$status = isset($data['status']) ? $data['status'] : 0;
|
|
$status = isset($data['status']) ? $data['status'] : 0;
|
|
|
$mark = isset($data['mark']) ? $data['mark'] : 0;
|
|
$mark = isset($data['mark']) ? $data['mark'] : 0;
|
|
|
- if ($data && $userId && $status != 1 && $mark==1) {
|
|
|
|
|
|
|
+ if ($data && $userId && $status != 1 && $mark == 1) {
|
|
|
$this->error = 2011;
|
|
$this->error = 2011;
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
@@ -207,15 +207,15 @@ class MemberService extends BaseService
|
|
|
$userId = $this->model->max('id') + 1;
|
|
$userId = $this->model->max('id') + 1;
|
|
|
|
|
|
|
|
// 推荐人
|
|
// 推荐人
|
|
|
- $rid = isset($params['rid'])? intval($params['rid']) : 0;
|
|
|
|
|
|
|
+ $rid = isset($params['rid']) ? intval($params['rid']) : 0;
|
|
|
$parents = '';
|
|
$parents = '';
|
|
|
- if($rid){
|
|
|
|
|
- $inviteInfo = $this->model->where(['id'=> $rid,'mark'=>1])
|
|
|
|
|
- ->select(['id','parent_id','parents','status'])
|
|
|
|
|
|
|
+ if ($rid) {
|
|
|
|
|
+ $inviteInfo = $this->model->where(['id' => $rid, 'mark' => 1])
|
|
|
|
|
+ ->select(['id', 'parent_id', 'parents', 'status'])
|
|
|
->first();
|
|
->first();
|
|
|
- $parents = isset($inviteInfo['parents'])? $inviteInfo['parents'] : '';
|
|
|
|
|
- if($inviteInfo){
|
|
|
|
|
- $parents = $parents? $parents.$rid.',' : ",{$rid},";
|
|
|
|
|
|
|
+ $parents = isset($inviteInfo['parents']) ? $inviteInfo['parents'] : '';
|
|
|
|
|
+ if ($inviteInfo) {
|
|
|
|
|
+ $parents = $parents ? $parents . $rid . ',' : ",{$rid},";
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -242,7 +242,7 @@ class MemberService extends BaseService
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
} // 更新登录信息
|
|
} // 更新登录信息
|
|
|
- else if ($mark==0 || !RedisService::get("caches:members:login_{$userId}")) {
|
|
|
|
|
|
|
+ else if ($mark == 0 || !RedisService::get("caches:members:login_{$userId}")) {
|
|
|
$updateData = [
|
|
$updateData = [
|
|
|
'login_ip' => get_client_ip(),
|
|
'login_ip' => get_client_ip(),
|
|
|
'create_time' => time(),
|
|
'create_time' => time(),
|
|
@@ -257,7 +257,7 @@ class MemberService extends BaseService
|
|
|
$updateData['openid'] = $openid;
|
|
$updateData['openid'] = $openid;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if($mark==0){
|
|
|
|
|
|
|
+ if ($mark == 0) {
|
|
|
$data['mobile'] = $phone;
|
|
$data['mobile'] = $phone;
|
|
|
$data['openid'] = $openid;
|
|
$data['openid'] = $openid;
|
|
|
$avatar = '';
|
|
$avatar = '';
|
|
@@ -274,7 +274,7 @@ class MemberService extends BaseService
|
|
|
// 结果返回
|
|
// 结果返回
|
|
|
$result = [
|
|
$result = [
|
|
|
'access_token' => $token,
|
|
'access_token' => $token,
|
|
|
- 'info' => ['uid' => $userId, 'openid' => $openid, 'has_info' => $avatar && $nickName?1 :0, 'nickname' => $data['nickname']],
|
|
|
|
|
|
|
+ 'info' => ['uid' => $userId, 'openid' => $openid, 'has_info' => $avatar && $nickName ? 1 : 0, 'nickname' => $data['nickname']],
|
|
|
];
|
|
];
|
|
|
|
|
|
|
|
// 用户缓存信息
|
|
// 用户缓存信息
|
|
@@ -314,13 +314,13 @@ class MemberService extends BaseService
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if(!$this->model->where(['id'=>$userId])->update(['password'=> get_password($password),'update_time'=>time()])){
|
|
|
|
|
|
|
+ if (!$this->model->where(['id' => $userId])->update(['password' => get_password($password), 'update_time' => time()])) {
|
|
|
$this->error = 2030;
|
|
$this->error = 2030;
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 操作日志
|
|
// 操作日志
|
|
|
- ActionLogModel::setRecord($userId,['type'=>2,'title'=>'重置密码','content'=>'重置登录密码','module'=>'member']);
|
|
|
|
|
|
|
+ ActionLogModel::setRecord($userId, ['type' => 2, 'title' => '重置密码', 'content' => '重置登录密码', 'module' => 'member']);
|
|
|
ActionLogModel::record();
|
|
ActionLogModel::record();
|
|
|
|
|
|
|
|
$this->error = 2031;
|
|
$this->error = 2031;
|
|
@@ -344,52 +344,52 @@ class MemberService extends BaseService
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 验证码验证
|
|
// 验证码验证
|
|
|
- $smsCode = isset($params['sms_code'])? trim($params['sms_code']) : '';
|
|
|
|
|
|
|
+ $smsCode = isset($params['sms_code']) ? trim($params['sms_code']) : '';
|
|
|
if (!SmsService::make()->check($mobile, $smsCode, 'register')) {
|
|
if (!SmsService::make()->check($mobile, $smsCode, 'register')) {
|
|
|
$this->error = SmsService::make()->getError();
|
|
$this->error = SmsService::make()->getError();
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 验证是否注册
|
|
// 验证是否注册
|
|
|
- if($this->model->where(['mobile' => $mobile, 'mark' => 1])->value('id')){
|
|
|
|
|
|
|
+ if ($this->model->where(['mobile' => $mobile, 'mark' => 1])->value('id')) {
|
|
|
$this->error = 2002;
|
|
$this->error = 2002;
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 驾驶证
|
|
// 驾驶证
|
|
|
- $drivingLicense = isset($params['driving_license']) && $params['driving_license']? get_image_path($params['driving_license']) : '';
|
|
|
|
|
|
|
+ $drivingLicense = isset($params['driving_license']) && $params['driving_license'] ? get_image_path($params['driving_license']) : '';
|
|
|
if (empty($drivingLicense)) {
|
|
if (empty($drivingLicense)) {
|
|
|
- $this-> error = 2007;
|
|
|
|
|
|
|
+ $this->error = 2007;
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 行驶证
|
|
// 行驶证
|
|
|
- $driversLicense = isset($params['drivers_license']) && $params['drivers_license']? get_image_path($params['drivers_license']) : '';
|
|
|
|
|
|
|
+ $driversLicense = isset($params['drivers_license']) && $params['drivers_license'] ? get_image_path($params['drivers_license']) : '';
|
|
|
if (empty($driversLicense)) {
|
|
if (empty($driversLicense)) {
|
|
|
- $this-> error = 2008;
|
|
|
|
|
|
|
+ $this->error = 2008;
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$id = $this->model->max('id') + 1;
|
|
$id = $this->model->max('id') + 1;
|
|
|
- $system = isset($params['system'])? $params['system'] : [];
|
|
|
|
|
- $system = $system && !is_array($system)? json_decode($system,true) : $system;
|
|
|
|
|
|
|
+ $system = isset($params['system']) ? $params['system'] : [];
|
|
|
|
|
+ $system = $system && !is_array($system) ? json_decode($system, true) : $system;
|
|
|
$appSources = isset($system['app_sources']) ? $system['app_sources'] : '';
|
|
$appSources = isset($system['app_sources']) ? $system['app_sources'] : '';
|
|
|
$uuid = isset($system['uuid']) ? $system['uuid'] : '';
|
|
$uuid = isset($system['uuid']) ? $system['uuid'] : '';
|
|
|
$data = [
|
|
$data = [
|
|
|
- 'mobile'=> $mobile,
|
|
|
|
|
- 'user_type'=> 2,
|
|
|
|
|
- 'avatar'=> '',
|
|
|
|
|
- 'nickname'=> $nickname ? $nickname : 'DU'.rand(10,99).substr($mobile,-6,6),
|
|
|
|
|
- 'realname'=> isset($params['realname'])? trim($params['realname']) : '',
|
|
|
|
|
- 'password'=> get_password($password),
|
|
|
|
|
- 'car_number'=> isset($params['car_number'])? trim($params['car_number']) : '',
|
|
|
|
|
- 'car_type'=> isset($params['car_type'])? trim($params['car_type']) : '',
|
|
|
|
|
- 'driving_license'=> $drivingLicense,
|
|
|
|
|
- 'drivers_license'=> $driversLicense,
|
|
|
|
|
- 'code'=> strtoupper(get_random_code(9, 'D', "{$id}")),
|
|
|
|
|
|
|
+ 'mobile' => $mobile,
|
|
|
|
|
+ 'user_type' => 2,
|
|
|
|
|
+ 'avatar' => '',
|
|
|
|
|
+ 'nickname' => $nickname ? $nickname : 'DU' . rand(10, 99) . substr($mobile, -6, 6),
|
|
|
|
|
+ 'realname' => isset($params['realname']) ? trim($params['realname']) : '',
|
|
|
|
|
+ 'password' => get_password($password),
|
|
|
|
|
+ 'car_number' => isset($params['car_number']) ? trim($params['car_number']) : '',
|
|
|
|
|
+ 'car_type' => isset($params['car_type']) ? trim($params['car_type']) : '',
|
|
|
|
|
+ 'driving_license' => $drivingLicense,
|
|
|
|
|
+ 'drivers_license' => $driversLicense,
|
|
|
|
|
+ 'code' => strtoupper(get_random_code(9, 'D', "{$id}")),
|
|
|
'app_uuid' => $uuid,
|
|
'app_uuid' => $uuid,
|
|
|
'device' => $appSources == 'android' ? 2 : 1,
|
|
'device' => $appSources == 'android' ? 2 : 1,
|
|
|
- 'create_time'=> time(),
|
|
|
|
|
|
|
+ 'create_time' => time(),
|
|
|
'status' => 1,
|
|
'status' => 1,
|
|
|
'picker_status' => 1,
|
|
'picker_status' => 1,
|
|
|
'confirm_remark' => '',
|
|
'confirm_remark' => '',
|
|
@@ -400,8 +400,8 @@ class MemberService extends BaseService
|
|
|
'login_ip' => get_client_ip(),
|
|
'login_ip' => get_client_ip(),
|
|
|
];
|
|
];
|
|
|
|
|
|
|
|
- if(!$userId = $this->model->insertGetId($data)){
|
|
|
|
|
- $this-> error = 2003;
|
|
|
|
|
|
|
+ if (!$userId = $this->model->insertGetId($data)) {
|
|
|
|
|
+ $this->error = 2003;
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -412,7 +412,7 @@ class MemberService extends BaseService
|
|
|
// 结果返回
|
|
// 结果返回
|
|
|
$result = [
|
|
$result = [
|
|
|
'access_token' => $token,
|
|
'access_token' => $token,
|
|
|
- 'info' => ['uid' => $userId,'nickname' => $data['nickname']],
|
|
|
|
|
|
|
+ 'info' => ['uid' => $userId, 'nickname' => $data['nickname']],
|
|
|
];
|
|
];
|
|
|
|
|
|
|
|
// 注册成功
|
|
// 注册成功
|
|
@@ -452,8 +452,8 @@ class MemberService extends BaseService
|
|
|
|
|
|
|
|
// 获取头像
|
|
// 获取头像
|
|
|
$avatar = '';
|
|
$avatar = '';
|
|
|
- if(isset($params['avatar']) && $params['avatar']){
|
|
|
|
|
- $avatar = save_base64_image($params['avatar'],'avatar');
|
|
|
|
|
|
|
+ if (isset($params['avatar']) && $params['avatar']) {
|
|
|
|
|
+ $avatar = save_base64_image($params['avatar'], 'avatar');
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//
|
|
//
|
|
@@ -482,93 +482,29 @@ class MemberService extends BaseService
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * 注册资料重新提交
|
|
|
|
|
- * @param $userId
|
|
|
|
|
- * @param $params
|
|
|
|
|
- * @return bool
|
|
|
|
|
- */
|
|
|
|
|
- public function profileModify($userId, $params)
|
|
|
|
|
- {
|
|
|
|
|
- $cacheLockKey = "caches:members:profile_modify_{$userId}";
|
|
|
|
|
- if(RedisService::get($cacheLockKey)){
|
|
|
|
|
- $this->error = 1034;
|
|
|
|
|
- return false;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- // 用户验证
|
|
|
|
|
- RedisService::set($cacheLockKey, ['user_id'=> $userId,'params'=>$params], rand(2,3));
|
|
|
|
|
- $info = $this->model->where(['id' => $userId, 'mark' => 1])
|
|
|
|
|
- ->select(['id', 'password','confirm_status', 'status'])
|
|
|
|
|
- ->first();
|
|
|
|
|
- $confirmStatus = isset($info['confirm_status']) ? $info['confirm_status'] : 0;
|
|
|
|
|
- if (!$info || $info['status'] != 1) {
|
|
|
|
|
- $this->error = 2016;
|
|
|
|
|
- RedisService::clear($cacheLockKey);
|
|
|
|
|
- return false;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- if($confirmStatus == 1){
|
|
|
|
|
- $this->error = 2041;
|
|
|
|
|
- RedisService::clear($cacheLockKey);
|
|
|
|
|
- return false;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- // 验证码验证(不传不验证)
|
|
|
|
|
- $mobile = isset($params['mobile'])? trim($params['mobile']) : '';
|
|
|
|
|
- $smsCode = isset($params['sms_code'])? trim($params['sms_code']) : '';
|
|
|
|
|
- if (isset($params['sms_code']) && !SmsService::make()->check($mobile, $smsCode, 'profile')) {
|
|
|
|
|
- $this->error = SmsService::make()->getError();
|
|
|
|
|
- return false;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- //
|
|
|
|
|
- $data = ['confirm_status'=>2,'confirm_remark'=>'','create_time'=>time(),'update_time' => time()];
|
|
|
|
|
-
|
|
|
|
|
- // 修改数据(不传不修改)
|
|
|
|
|
- if (isset($params['mobile']) && $mobile) {
|
|
|
|
|
- $data['mobile'] = $mobile;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- $realname = isset($params['realname']) ? trim($params['realname']) : '';
|
|
|
|
|
- if (isset($params['realname']) && $realname) {
|
|
|
|
|
- $data['realname'] = $realname;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- if (!$this->model->where(['id' => $userId])->update($data)) {
|
|
|
|
|
- $this->error = 2010;
|
|
|
|
|
- RedisService::clear($cacheLockKey);
|
|
|
|
|
- return false;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- $this->error = 2011;
|
|
|
|
|
- RedisService::clear($cacheLockKey);
|
|
|
|
|
- return true;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- /**
|
|
|
|
|
* 获取资料详情
|
|
* 获取资料详情
|
|
|
* @param $where
|
|
* @param $where
|
|
|
* @param array $field
|
|
* @param array $field
|
|
|
*/
|
|
*/
|
|
|
- public function getInfo($where, array $field = [], $refresh=true)
|
|
|
|
|
|
|
+ public function getInfo($where, array $field = [], $refresh = true)
|
|
|
{
|
|
{
|
|
|
- if(empty($where)){
|
|
|
|
|
|
|
+ if (empty($where)) {
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- $fieldKey = $field? '_'.md5(json_encode($field)) : '';
|
|
|
|
|
- $cacheKey = "caches:members:info_".(!is_array($where)? $where.$fieldKey: md5(json_encode($where).$fieldKey));
|
|
|
|
|
|
|
+ $fieldKey = $field ? '_' . md5(json_encode($field)) : '';
|
|
|
|
|
+ $cacheKey = "caches:members:info_" . (!is_array($where) ? $where . $fieldKey : md5(json_encode($where) . $fieldKey));
|
|
|
$info = RedisService::get($cacheKey);
|
|
$info = RedisService::get($cacheKey);
|
|
|
- if($info && !$refresh){
|
|
|
|
|
|
|
+ if ($info && !$refresh) {
|
|
|
return $info;
|
|
return $info;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- $defaultField = ['id', 'user_type', 'realname', 'mobile', 'nickname','balance', 'code', 'openid', 'status', 'avatar'];
|
|
|
|
|
|
|
+ $defaultField = ['id', 'user_type', 'realname', 'mobile', 'nickname', 'balance', 'code', 'openid', 'status', 'avatar'];
|
|
|
$field = $field ? $field : $defaultField;
|
|
$field = $field ? $field : $defaultField;
|
|
|
if (is_array($where)) {
|
|
if (is_array($where)) {
|
|
|
- $info = $this->model->with(['store','agent'])->where(['mark' => 1])->where($where)->select($field)->first();
|
|
|
|
|
|
|
+ $info = $this->model->with(['store', 'agent'])->where(['mark' => 1])->where($where)->select($field)->first();
|
|
|
} else {
|
|
} else {
|
|
|
- $info = $this->model->with(['store','agent'])->where(['mark' => 1])->where(['id' => (int)$where])->select($field)->first();
|
|
|
|
|
|
|
+ $info = $this->model->with(['store', 'agent'])->where(['mark' => 1])->where(['id' => (int)$where])->select($field)->first();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$info = $info ? $info->toArray() : [];
|
|
$info = $info ? $info->toArray() : [];
|
|
@@ -581,12 +517,19 @@ class MemberService extends BaseService
|
|
|
$info['mobile_text'] = $info['mobile'] ? format_mobile($info['mobile']) : '';
|
|
$info['mobile_text'] = $info['mobile'] ? format_mobile($info['mobile']) : '';
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if(isset($info['create_time'])){
|
|
|
|
|
|
|
+ if (isset($info['create_time'])) {
|
|
|
$info['create_at'] = datetime(strtotime($info['create_time']));
|
|
$info['create_at'] = datetime(strtotime($info['create_time']));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- $info['store'] = isset($info['store'])? $info['store'] : [];
|
|
|
|
|
- $info['agent'] = isset($info['agent'])? $info['agent'] : [];
|
|
|
|
|
|
|
+ $info['store'] = isset($info['store']) ? $info['store'] : [];
|
|
|
|
|
+ $info['agent'] = isset($info['agent']) ? $info['agent'] : [];
|
|
|
|
|
+
|
|
|
|
|
+ $info['agent_level'] = 0;
|
|
|
|
|
+ $type = request()->post('type', 1);
|
|
|
|
|
+ if ($type == 'agent' && $info['agent']) {
|
|
|
|
|
+ $info['agent_level'] = $this->getAgentLevel($info['id']);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
RedisService::set($cacheKey, $info, rand(30, 60));
|
|
RedisService::set($cacheKey, $info, rand(30, 60));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -594,6 +537,40 @@ class MemberService extends BaseService
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
|
|
+ * 获取代理等级
|
|
|
|
|
+ * @param $uid
|
|
|
|
|
+ * @return array|int|mixed
|
|
|
|
|
+ */
|
|
|
|
|
+ public function getAgentLevel($uid)
|
|
|
|
|
+ {
|
|
|
|
|
+ $cacheKey = "caches:members:agentLevel:{$uid}";
|
|
|
|
|
+ $data = RedisService::get($cacheKey);
|
|
|
|
|
+ if ($data) {
|
|
|
|
|
+ return $data;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ $data = $this->model->from('member as a')
|
|
|
|
|
+ ->leftJoin('agents as b', function ($join) {
|
|
|
|
|
+ $join->on('b.user_id', '=', 'a.id')->where(['b.status' => 1, 'b.mark' => 1]);
|
|
|
|
|
+ })
|
|
|
|
|
+ ->where('b.id', '>', 0)
|
|
|
|
|
+ ->where('a.parents', 'like', "%,{$uid},%")
|
|
|
|
|
+ ->where(['a.status' => 1, 'a.mark' => 1])
|
|
|
|
|
+ ->select(['a.id', 'a.parents'])
|
|
|
|
|
+ ->orderBy('a.parents', 'desc')
|
|
|
|
|
+ ->first();
|
|
|
|
|
+ $data = $data ? $data->toArray() : [];
|
|
|
|
|
+ $parents = isset($data['parents']) && $data['parents'] ? trim($data['parents'], ',') : '';
|
|
|
|
|
+ $parents = $parents ? explode(',', $parents) : [];
|
|
|
|
|
+ $level = $parents ? count($parents) : 0;
|
|
|
|
|
+ if($level){
|
|
|
|
|
+ RedisService::set($cacheKey, $level, rand(5,10));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ return $level;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
* 生成普通参数二维码
|
|
* 生成普通参数二维码
|
|
|
* @param $str 参数
|
|
* @param $str 参数
|
|
|
* @param bool $refresh 是否重新生成
|
|
* @param bool $refresh 是否重新生成
|
|
@@ -650,13 +627,13 @@ class MemberService extends BaseService
|
|
|
public function modify($userId, $params)
|
|
public function modify($userId, $params)
|
|
|
{
|
|
{
|
|
|
$cacheLockKey = "caches:members:modify_{$userId}";
|
|
$cacheLockKey = "caches:members:modify_{$userId}";
|
|
|
- if(RedisService::get($cacheLockKey)){
|
|
|
|
|
|
|
+ if (RedisService::get($cacheLockKey)) {
|
|
|
$this->error = 1034;
|
|
$this->error = 1034;
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 用户验证
|
|
// 用户验证
|
|
|
- RedisService::set($cacheLockKey, ['user_id'=> $userId,'params'=>$params], rand(2,3));
|
|
|
|
|
|
|
+ RedisService::set($cacheLockKey, ['user_id' => $userId, 'params' => $params], rand(2, 3));
|
|
|
$info = $this->model->where(['id' => $userId, 'mark' => 1])
|
|
$info = $this->model->where(['id' => $userId, 'mark' => 1])
|
|
|
->select(['id', 'password', 'status'])
|
|
->select(['id', 'password', 'status'])
|
|
|
->first();
|
|
->first();
|
|
@@ -694,7 +671,7 @@ class MemberService extends BaseService
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if(empty($newPassword)){
|
|
|
|
|
|
|
+ if (empty($newPassword)) {
|
|
|
$this->error = 1039;
|
|
$this->error = 1039;
|
|
|
RedisService::clear($cacheLockKey);
|
|
RedisService::clear($cacheLockKey);
|
|
|
return false;
|
|
return false;
|
|
@@ -734,43 +711,40 @@ class MemberService extends BaseService
|
|
|
$info = $this->model->where(['id' => $userId, 'mark' => 1])
|
|
$info = $this->model->where(['id' => $userId, 'mark' => 1])
|
|
|
->select(['id', 'password', 'status'])
|
|
->select(['id', 'password', 'status'])
|
|
|
->first();
|
|
->first();
|
|
|
- $status = isset($info['status'])? $info['status'] : 0;
|
|
|
|
|
- if(empty($info)){
|
|
|
|
|
|
|
+ $status = isset($info['status']) ? $info['status'] : 0;
|
|
|
|
|
+ if (empty($info)) {
|
|
|
$this->error = 2044;
|
|
$this->error = 2044;
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if($status != 1){
|
|
|
|
|
|
|
+ if ($status != 1) {
|
|
|
$this->error = 2044;
|
|
$this->error = 2044;
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if(OrderModel::whereIn('status',[1,2])->where(['user_id'=>$userId,'mark'=>1])->value('id'))
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if (OrderModel::whereIn('status', [1, 2])->where(['user_id' => $userId, 'mark' => 1])->value('id')) {
|
|
|
$this->error = 2045;
|
|
$this->error = 2045;
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if(DepositModel::where('refund_status',1)->where(['user_id'=>$userId,'mark'=>1])->value('id'))
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if (DepositModel::where('refund_status', 1)->where(['user_id' => $userId, 'mark' => 1])->value('id')) {
|
|
|
$this->error = 2046;
|
|
$this->error = 2046;
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if(BalanceLogModel::where('status',1)->where(['user_id'=>$userId,'type'=>2,'mark'=>1])->value('id'))
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if (BalanceLogModel::where('status', 1)->where(['user_id' => $userId, 'type' => 2, 'mark' => 1])->value('id')) {
|
|
|
$this->error = 2047;
|
|
$this->error = 2047;
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if(!$this->model->where(['id'=> $userId])->update(['status'=>3,'update_time'=>time()])){
|
|
|
|
|
|
|
+ if (!$this->model->where(['id' => $userId])->update(['status' => 3, 'update_time' => time()])) {
|
|
|
$this->error = 2049;
|
|
$this->error = 2049;
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
$this->error = 2048;
|
|
$this->error = 2048;
|
|
|
- RedisService::clear("auths:info:".$userId);
|
|
|
|
|
|
|
+ RedisService::clear("auths:info:" . $userId);
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
|
|
|