完善分享商品对新注册用户

app/common/repositories/user/UserRepository.php

@@ -1444,7 +1444,7 @@ class UserRepository extends BaseRepository
     }
 
     //$repository->registr($data['phone'], $data['password'],'APP',"","",$data['spread']);
-    public function registr(string $phone, ?string $pwd, $user_type = 'h5',$url="",$nickname="",$external=1,$spread_uid=null)
+    public function registr(string $phone, ?string $pwd, $user_type = 'h5',$url="",$nickname="",$external=1,$spread_uid=0)
     {
         $user_res = Db::name('user')->where('phone', $phone)->find();
         if ($user_res && !$user_res['account']) {
@@ -3266,7 +3266,7 @@ class UserRepository extends BaseRepository
 
 
     /*微信支付宝绑定*/
-    public function thirdBinding(string $phone, ?string $pwd, $user_type = 'APP',$third_user_id='',$type=0,$url)
+    public function thirdBinding(string $phone, ?string $pwd, $user_type = 'APP',$third_user_id='',$type=0,$url, $spread_uid = 0)
     {
         $pwd = $pwd ? $this->encodePassword($pwd) : $this->encodePassword($this->dao->defaultPwd());
         $user = $this->accountByUser($phone);
@@ -3282,6 +3282,8 @@ class UserRepository extends BaseRepository
                 'avatar' => $url.'/uploads/logo.jpg',
                 'phone' => $phone,
                 'last_ip' => app('request')->ip(),
+                "level_id"=>$spread_uid,
+                "spread_uid"=>$spread_uid
             ];
         }
         if($type ==1){

app/controller/api/Auth.php

@@ -1477,11 +1477,12 @@ class Auth extends BaseController
 
         $user = $repository->accountByUser($data['phone']);
         if (!$user){
-            if (!intval($data['spread'])) {
+            $data['spread_uid'] = 0;
+            if (!intval($data['share_id'])) {
                 $spread_uid = Db::name('product_share')->where('id', $data['share_id'])->value('uid');
-                $data['spread'] = $spread_uid;
+                $data['spread_uid'] = $spread_uid;
             }
-            $user = $repository->registr($data['phone'], null, 'h5', $data['spread']);
+            $user = $repository->registr($data['phone'], null, 'h5', '','',1, $data['spread_uid']);
         }
         $user = $repository->mainUser($user);
 
@@ -1696,7 +1697,12 @@ class Auth extends BaseController
      */
     public function binding(UserAuthValidate $validate, UserRepository $repository)
     {
-        $data = $this->request->params(['phone', 'sms_code', 'password','third_user_id','type','nickName','avatarUrl','sms']);
+        $data = $this->request->params(['phone', 'sms_code', 'password','third_user_id','type','sms']);
+
+        $data['nickName'] = $this->request->param('nickName', null);
+        $data['avatarUrl'] = $this->request->param('avatarUrl', null);
+        $share_id = $this->request->param('share_id', null);
+        $spread_uid = 0;
 
         if(!$data['third_user_id'] || $data['third_user_id'] == '' || $data['third_user_id'] =='undefined'){
             return app('json')->fail("绑定失败");
@@ -1707,7 +1713,11 @@ class Auth extends BaseController
             if (!$this->checkSmsCode($data['phone'], $data['sms_code']))
                 return app('json')->fail('验证码不正确');
         }
-        $user = $repository->thirdBinding($data['phone'], $data['password'],'APP',$data['third_user_id'],$data['type'],"https://". $this->request->host(true));//2222
+        if (!empty($share_id)) {
+            $spread_uid = Db::name('product_share')->where('id', $share_id)->value('uid');
+        }
+
+        $user = $repository->thirdBinding($data['phone'], $data['password'],'APP',$data['third_user_id'],$data['type'],"https://". $this->request->host(true), $spread_uid);//2222
         if($user){
 
             $userRepository = app()->make(UserRepository::class);
@@ -1752,12 +1762,15 @@ class Auth extends BaseController
             } else {
                 $data1 = ["ali_user_id" => $data['third_user_id']];
             }
-            $data2 = [
-                "type" => $data['type'],
-                "uid" => $user->uid,
-                "nickname" => !empty($data['nickName']) ? $data['nickName'] : $user -> nickname,
-                "avater" => !empty($data['avatarUrl']) ? $data['avatarUrl'] : $user -> avater,
-            ];
+            $data2 = [];
+            if (!is_null($data['nickName']) || !is_null($data['avatarUrl'])) {
+                $data2 = [
+                    "type" => $data['type'],
+                    "uid" => $user->uid,
+                    "nickname" => $data['nickName'],
+                    "avater" => $data['avatarUrl'],
+                ];
+            }
             $userRepository -> updateUser($user->uid,$data1,$data2);
 
             $pid = $this->request->param('spread', 0);
@@ -1950,7 +1963,10 @@ class Auth extends BaseController
 
             if(!$user_res){
                 $spread_uid=Db::name('product_share')->where('id',$share_id['share_id'])->value('uid');
-                $repository->registr($phone, 123456,'APP',$spread_uid);
+                if (!intval($spread_uid)) {
+                    $spread_uid = 0;
+                }
+                $repository->registr($phone, 123456,'APP','','','',$spread_uid);
             }
             $user = $repository->accountByUser($phone);
             if($this->source=='yhc' && $this->merId){