Merge remote-tracking branch 'origin/dev' into dev

app/controller/api/Auth.php

@@ -514,12 +514,12 @@ class Auth extends BaseController
             }
         }
         // Log::info($data);
-        $user = $repository->registr($data['phone'], $data['password'],'APP',"","",1,$data['spread']);
+        $user = $repository->registr($data['phone'], $data['password'],'APP',"","",1,0);
         // $repository->registr($data['phone'], $data['password'],'APP',$data['spread']);
         $repository->addagent($user);
         $user = $repository->mainUser($user);
 
-        $repository->bindSpread($user, intval($data['spread']));
+//        $repository->bindSpread($user, intval($data['spread']));
 //        $repository->spread_log($user, intval($data['spread']));
         $tokenInfo = $repository->createToken($user);
         $repository->loginAfter($user);
@@ -538,26 +538,66 @@ class Auth extends BaseController
 //                }
 //            }
 //        }
-        if ($type == "marketing"){
-            $spread = Db::name("User") -> alias("u") -> leftjoin("MarketingUser mu","u.uid = mu.uid") ->  where("u.uid",$data['spread']) -> field("u.uid,mu.spread_list") -> find();
-            $spread_list = explode(',',$spread['spread_list']);
-            if (!empty($spread_list)){
-                $spread_list[] = "[" . $spread['uid'] . "]";
-            }else{
-                array_push($spread_list,"[".$spread['uid']."]");
-            }
-            $spread_list = array_filter($spread_list);
-            $data = [
-                "uid" => $user->uid,
-                "spread_uid" => $spread['uid'],
-                "spread_list" => implode(",",$spread_list)
-            ];
-            Db::name("MarketingUser") -> insert($data);
+//        if ($type == "marketing"){
+//            $spread = Db::name("User") -> alias("u") -> leftjoin("MarketingUser mu","u.uid = mu.uid") ->  where("u.uid",$data['spread']) -> field("u.uid,mu.spread_list") -> find();
+//            $spread_list = explode(',',$spread['spread_list']);
+//            if (!empty($spread_list)){
+//                $spread_list[] = "[" . $spread['uid'] . "]";
+//            }else{
+//                array_push($spread_list,"[".$spread['uid']."]");
+//            }
+//            $spread_list = array_filter($spread_list);
+//                    $data = [
+//                "uid" => $user->uid,
+//                "spread_uid" => $spread['uid'],
+//                "spread_list" => implode(",",$spread_list)
+//            ];
+//            Db::name("MarketingUser") -> insert($data);
+//        }
+
+        $result = $repository->returnToken($user, $tokenInfo);
+        $result['uid'] = $user->uid;
+
+        return app('json')->success($result);
+
+    }
+
+    /**
+     * 用户注册后绑定邀请人
+     */
+    public function registerBindSpread(UserRepository $repository)
+    {
+        $data = $this->request->params(['uid', 'spread_phone']);
+        $user = Db::name('user')->where('uid', $data['uid'])->field('uid,spread_uid')->find();
+        if (!$user) {
+            return app('json')->fail('注册失败,用户不存在');
+        }
+        if (empty($data['spread_phone'])) {
+            return app('json')->fail('推荐人手机号不能为空');
+        }
+        $spread_user = Db::name('user')->where('phone', $data['spread_phone'])->field('uid')->find();
+        if (!$spread_user) {
+            return app('json')->fail('推荐人手机号不存在');
+        }
+        if(empty($data['uid'])==$user['uid']){
+            return app('json')->fail('不能绑定自己为推荐人');
         }
 
-        return app('json')->success($repository->returnToken($user, $tokenInfo));
+        $spreadUid = $spread_user['uid'];//绑定推荐人
+        Db::name('user')->where('uid', $user['uid'])->update(['spread_uid'  => $spreadUid, 'spread_time' => date('Y-m-d H:i:s')]);
+
+        //给推荐人下级+1
+        Db::name('user')->where('uid', $spreadUid)->update(['spread_count' => Db::raw('spread_count + 1')]);
+        //积分表更新
+        $this->sign_add($spreadUid, 30,1,'邀请好友注册奖励积分','','', '', 1, '', 2);
+
+        Cache::zincrby('s_top_' . date('Y-m'), 1, $spreadUid);
+        Cache::zincrby('s_top_' . monday(), 1, $spreadUid);
+        return app('json')->success('绑定成功');
+
     }
 
+
     /**
      * 手机号找回密码
      * @param UserRepository $repository
@@ -1364,22 +1404,42 @@ class Auth extends BaseController
         $data = $this->request->params(['phone', 'code', 'key',"type", 'areaCode']);
         $validate->sceneVerify()->check($data);
         log::info("发送短信方法");
+        if ($data['type']=="login"){
+            $count=Db::name("user")->where("phone", $data["phone"])->count();
+            if (!$count){
+                return app('json')->make(405, '该手机号未注册,请去注册');
+            }
+            $sms_num_key = 'api.auth.num.' . $data['phone'];
+            $num = Cache::get($sms_num_key) ?: 0;
+            log::info("num{$num}");
+
+            if ($num > 9) {
+                if (!$data['code'])
+                    return app('json')->make(402, '操作过于频繁，请稍后重试~');
+                if (!$this->smslogin($data['phone'], $data['code'])) {
+                    return app('json')->fail('登录验证码输入有误');
+                }
+            }
+        }
+
         if ($data['type']=="register"){
             $count=Db::name("user")->where("phone", $data["phone"])->count();
             if ($count){
-                return app('json')->make(405, '该手机号已注册');
+                return app('json')->make(405, '该手机号已注册,请直接登录');
+            }
+            $sms_num_key = 'api.auth.num.' . $data['phone'];
+            $num = Cache::get($sms_num_key) ?: 0;
+            log::info("num{$num}");
+
+            if ($num > 9) {
+                if (!$data['code'])
+                    return app('json')->make(402, '操作过于频繁，请稍后重试~');
+                if (!$this->registersmscode($data['phone'], $data['code'])) {
+                    return app('json')->fail('注册验证码输入有误');
+                }
             }
         }
-        $sms_num_key = 'api.auth.num.' . $data['phone'];
         $sms_key = 'api.auth.sms.' . $data['phone'];
-        $num = Cache::get($sms_num_key) ? Cache::get($sms_num_key) : 0;
-        log::info("num{$num}" );
-        if ($num > 9) {
-            if (!$data['code'])
-                return app('json')->make(402, '操作过于频繁，请稍后重试~');
-            if (!$this->checkCaptcha($data['key'], $data['code']))
-                return app('json')->fail('验证码输入有误');
-        }
         $sms_code = str_pad(random_int(1, 9999), 4, 0, STR_PAD_LEFT);
         $sms_time = systemConfig('sms_time') ? systemConfig('sms_time') : 30 ;
         $res = app()->make(AliYunSmsService::class)->send(($data['areaCode'] ?? '') . $data['phone'],  $sms_code);
@@ -1533,14 +1593,8 @@ class Auth extends BaseController
 
         $user = $repository->accountByUser($data['phone']);
         if (!$user){
-            $data['spread_uid'] = 0;
-            if (intval($data['share_id'])) {
-                $spread_uid = Db::name('product_share')->where('id', $data['share_id'])->value('uid');
-                $data['spread_uid'] = $spread_uid;
-            }
-            $user = $repository->registr($data['phone'], null, 'h5', '','',1, $data['spread_uid']);
+            return app('json')->fail('手机号未注册，请先注册');
         }
-        $user = $repository->mainUser($user);
 
         // if($this->source=='yhc' && $this->merId){
         //     $where=['mer_id'=>$this->merId,'uid'=>$user->uid];
@@ -1569,6 +1623,27 @@ class Auth extends BaseController
         return app('json')->success($repository->returnToken($user, $tokenInfo));
     }
 
+    public function registerSmscode(UserAuthValidate $validate, UserRepository $repository)
+    {
+        $data = $this->request->params(['phone', 'sms_code', 'spread_uid']);
+        $validate->sceneSmslogin()->check($data);
+
+        $count = Db::name('user')->where('phone', $data['phone'])->count();
+        if ($count > 0) {
+            return app('json')->fail('手机号已注册，请直接登录');
+        }
+
+        if (!$this->checkSmsCode($data['phone'], $data['sms_code'])) {
+            return app('json')->fail('验证码不正确');
+        }
+        return app('json')->success([
+            'msg' => '验证码验证通过，请填写推荐人手机号完成注册',
+            'phone' => $data['phone']
+        ]);
+
+    }
+
+
     public function merJavaRegister(UserRepository $repository){
         $data = $this->request->params(['phone', 'spread','token','sign']);
         Log::channel("gong")->info("供应链取消商品数据：" . json_encode($data));
@@ -1902,7 +1977,7 @@ class Auth extends BaseController
         $ins_data['addtime'] = time();
         $ins_data['status'] = $status;
         $ins_data['mark'] = $mark;
-        $ins_data['type'] = $type;
+        $ins_data['source_type'] = $type;
         $ins_data['settlement_time'] = $settlement_time;// 结算时间 真正到了结算时间会结算
         $ins_data['order_id'] = $order_id;
         $ins_data['pm'] = $pm;

route/api.php

@@ -931,6 +931,8 @@ Route::group('api/', function () {
     Route::post('auth/yijianlogin', 'api.Auth/yijianlogin');
     //短信注册
     Route::post('auth/register', 'api.Auth/register');
+    //注册后绑定邀请人
+    Route::post('auth/registerBindSpread', 'api.Auth/registerBindSpread');
     //测试账号
     Route::post('auth/register_all', 'api.Auth/register_all');
     //java商户端调用用户注册