BF-202205051124\Administrator 3 år sedan
förälder
incheckning
3dd1719675
2 ändrade filer med 12 tillägg och 40 borttagningar
  1. 10 27
      app/Http/Controllers/Api/MemberController.php
  2. 2 13
      app/Servers/MemberServer.php

+ 10 - 27
app/Http/Controllers/Api/MemberController.php

@@ -67,42 +67,25 @@ class MemberController extends FrontController
      */
     function register()
     {
-        $invite_code = request()->input('invite_code', '');
+        $invite_code = request()->input('inviteCode', '');
         if (!empty($invite_code)) {
-            $p_member = Member::where('invite_code', $invite_code)->where('status',1)->select(['id', 'phone'])->first();
+            $p_member = Member::where('invite_code', $invite_code)->where('status',1)->select(['id', 'address'])->first();
         }
         if (empty($p_member)) {
-            $p_member = Member::where('id', 1)->select(['id', 'phone'])->first();
+            return $this->apiResponseError('推荐码错误');
         }
-        $nickname = request()->input('nickname', '张三');
-        if(empty($nickname)){
-            return $this->apiResponseError('请输入昵称');
-        }
-        $mobile = request()->input('phone', '13900139110');
-        $password = request()->input('password', '123456');
-        $password = str_replace(' ', '', $password);
-        if (empty($password)) {
-            return $this->apiResponseError('请设置登录密码');
-        }
-        if (strlen($password) < 6) {
-            return $this->apiResponseError('登录密码最低6位');
-        }
-        $code = request()->input('code', '1234');
-        if (empty($code)) {
-            return $this->apiResponseError('请输入验证码');
-        }
-        $send_server = SmsServer::creatServer();
-        $code_ret = $send_server->verifyCode($mobile, $code, 'register');
-        if (empty($code_ret)) {
-            return $this->apiResponseError($send_server->getErrorMsg() ?: '验证码错误');
+
+        $address = request()->input('address', '');
+        if (empty($address)) {
+            return $this->apiResponseError('地址信息异常');
         }
-        $member = Member::where('address', $mobile)->where('status',1)->select(['id', 'token_str'])->first();
+        $member = Member::where('address', $address)->where('status',1)->select(['id', 'token_str'])->first();
         if ($member) {
             $token_str = PassServer::creatServer()->getMemberToken($member->{'id'});
             Member::where('id', $member->{'id'})->update(['token_str' => $token_str]);
-            return $this->apiResponseSuccess('登陆成功', ['m_id' => $member->{'id'}, 'token' => $token_str]);
+            return $this->apiResponseSuccess('登陆成功', [ 'token' => $token_str]);
         } else {
-            $ret = MemberServer::creatServer()->register($mobile, $p_member->{'id'}, $password, '');
+            $ret = MemberServer::creatServer()->register($address, $p_member->{'id'}, '', '');
             if (empty($ret)) {
                 return $this->apiResponseError('注册失败');
             } else {

+ 2 - 13
app/Servers/MemberServer.php

@@ -110,32 +110,21 @@ class MemberServer
         if ($password) {
             $member_info = $pass_server->creatPassword();
         }
-        $member_info['phone'] = $mobile;
+        $member_info['address'] = $mobile;
         $member_info['invite_code'] = $pass_server->getInviteCode();
-        $nickname=$this->emojiFilter($nickname);
-        $member_info['nickname'] = empty($nickname) ? ('' . $member_info['invite_code']) : $nickname;
 
-        $member_info['head_img'] = $head_img ?: 'https://jhnewshop.oss-cn-chengdu.aliyuncs.com/storage/attest/20210927/949e48fb7c286836097efdd4ba4d0bd9.jpg';
         $member_info['recom_id'] = $p_id;
         $member_info['status'] = 1;
         $member_info['level_id'] = $level_id;
-        $member_info['describe'] = '';
-        $member_info['source'] = 0;
-        $member_info['sex'] = $sex;
 
         $member_info = Member::create($member_info);
         if (empty($member_info)) {
             return false;
         }
-        //注册赠送消费金
-        $consume_money=CommonServer::creatServer()->getConfigValue('consume_money');
-        if($consume_money>0){
-            MoneyDetailServer::creatServer()->write(2,5,$consume_money,1,$member_info->{'id'},'注册赠送消费金');
-        }
         MemberClanServer::creatServer()->creatRelevance($member_info);
         $token_str = PassServer::creatServer()->getMemberToken($member_info->{'id'});
         Member::where('id', $member_info->{'id'})->update(['token_str' => $token_str]);
-        return ['m_id' => $member_info->{'id'}, 'token' => $token_str];
+        return [ 'token' => $token_str];
     }
 
     /**