From d79a7fdb91824a8bba2c6c2eb614b55a8cfae040 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 20 Mar 2023 17:17:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4nk=5Fuser?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../community/CommunityRepository.php | 8 +- .../merchant/MerchantIntentionRepository.php | 12 --- app/controller/api/Auth.php | 70 ++-------------- app/controller/api/user/User.php | 80 +------------------ app/listener/CommunityAddress.php | 3 +- 5 files changed, 14 insertions(+), 159 deletions(-) diff --git a/app/common/repositories/community/CommunityRepository.php b/app/common/repositories/community/CommunityRepository.php index cf0c0a16..d5888bcc 100644 --- a/app/common/repositories/community/CommunityRepository.php +++ b/app/common/repositories/community/CommunityRepository.php @@ -126,13 +126,7 @@ class CommunityRepository extends BaseRepository $list=[]; return compact('count','list'); } - $n_user_id=Db::name('nk_user')->where('user_id',$userInfo->uid)->value('n_user_id'); - if ($n_user_id==0 ||$n_user_id==''){ - $count=0; - $list=[]; - return compact('count','list'); - } - $village_id = Db::connect('nongke')->table('fa_szxc_information_useraddress')->where('user_id',$n_user_id)->value('village_id'); + $village_id = Db::connect('nongke')->table('fa_szxc_information_useraddress')->where('user_id',$userInfo->uid)->value('village_id'); $arr=Db::name('community_address')->where('village_id',$village_id)->page($page, $limit)->select(); if (count($arr)==0){ $count=0; diff --git a/app/common/repositories/system/merchant/MerchantIntentionRepository.php b/app/common/repositories/system/merchant/MerchantIntentionRepository.php index 7df87be1..941f8b84 100644 --- a/app/common/repositories/system/merchant/MerchantIntentionRepository.php +++ b/app/common/repositories/system/merchant/MerchantIntentionRepository.php @@ -177,18 +177,6 @@ class MerchantIntentionRepository extends BaseRepository $store_service_data['phone'] = $intention['phone']; $store_service_data['create_time'] = date('Y-m-d H:i:s'); Db::name('store_service')->insert($store_service_data); -// topservice - $top_store_service['mer_id'] = 0; - $top_store_service['uid'] = $intention['uid']; - $top_store_service['avatar'] = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/1b716202302251108516996.png'; - $top_store_service['nickname'] = $intention['mer_name']; - $top_store_service['account'] = $intention['phone']; - $top_store_service['pwd'] = password_hash('123456', PASSWORD_BCRYPT);; - $top_store_service['status'] = 1; - $top_store_service['is_open'] = 1; - $top_store_service['phone'] = $intention['phone']; - $top_store_service['create_time'] = date('Y-m-d H:i:s'); - Db::name('store_service')->insert($top_store_service); Queue::push(SendSmsJob::class, ['tempId' => 'APPLY_MER_SUCCESS', 'id' => $smsData]); } diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php index a36364bd..563158df 100644 --- a/app/controller/api/Auth.php +++ b/app/controller/api/Auth.php @@ -157,17 +157,13 @@ class Auth extends BaseController $data['extension_status'] = systemConfig('extension_status'); if (systemConfig('member_status')) $data['member_icon'] = $this->request->userInfo()->member->brokerage_icon ?? ''; if ($data['is_svip'] == 3) $data['svip_endtime'] = date('Y-m-d H:i:s',strtotime("+100 year")); - $find=Db::name('nk_user')->where('user_id',$user['uid'])->find(); $data['no_update']=1; - if ($find){ - $msg=Db::connect('nongke')->table('fa_szxc_information_usermsg')->where('user_id',$find['n_user_id'])->find(); + $data['group_id']=1; + $msg=Db::connect('nongke')->table('fa_szxc_information_usermsg')->where('user_id',$this->request->userInfo()->uid)->find(); if ($msg){ $data['no_update']=0; + $data['group_id']=$this->request->userInfo()->group_id; } - $data['group_id']=$find['group_id']; - }else{ - $data['group_id']=1; - } // 新增返回商户后台登录地址 $data['merchant_login'] = $this->request->domain().'/merchant'; // 判断是否是商户，并且有没有完善信息 @@ -223,7 +219,6 @@ class Auth extends BaseController } /** @var WechatUserRepository $make */ $make = app()->make(WechatUserRepository::class); - $user = $make->syncUser($wechatInfo['openid'], $wechatInfo); if (!$user) return app('json')->fail('授权失败[003]'); @@ -378,45 +373,6 @@ class Auth extends BaseController try { if (!$user) { $user = $repository->registr($data['phone'], null, $data['user_type']); - $msg = Db::connect('nongke')->table('fa_szxc_information_usermsg')->where('phone', $data['phone'])->find(); - if ($msg) { - $nk_user = Db::name('nk_user')->where('n_user_id', $msg['user_id'])->find(); - $users = Db::connect('nongke')->table('fa_user')->where('id', $msg['user_id'])->find(); - if (!$nk_user) { - $datas = [ - 'user_id' => $user['uid'], - 'n_user_id' => $msg['user_id'], - 'group_id' => $users['group_id'] - ]; - Db::name('nk_user')->insert($datas); - } else { - Db::name('user')->where('uid',$user['uid'])->update(['nickname'=>$msg['name']]); - Db::name('nk_user')->where('id', $nk_user['id'])->update(['user_id' => $user['uid'], 'group_id' => $users['group_id']]); - } - } else { - $time = time(); - $user_data = [ - 'openid' => 'wx' . $time, - 'group_id' => 1, - 'username' => 'wx' . $time, - 'nickname' => '微信用户' . $time, - 'avatar' => 'https://lihai001.oss-cn-chengdu.aliyuncs.com/uploads/20230111/58c84995456bc63b2660d9526f7062fc.png', - 'level' => 1, - 'prevtime' => $time, - 'jointime' => $time, - 'createtime' => $time, - 'updatetime' => $time, - 'status' => 'normal', - 'mobile' => $data['phone'], - ]; - $n_user_id = Db::connect('nongke')->table('fa_user')->insertGetId($user_data); - $datas = [ - 'user_id' => $user['uid'], - 'n_user_id' => $n_user_id, - 'group_id' => 1 - ]; - Db::name('nk_user')->insert($datas); - } } Db::commit(); } catch (\Exception $e) { @@ -432,18 +388,14 @@ class Auth extends BaseController $tokenInfo = $repository->createToken($user); $repository->loginAfter($user); - $find=Db::name('nk_user')->where('user_id',$user['uid'])->find(); $user['no_update']=1; - $user['group_ids'] = 1; - if ($find && $find['n_user_id']!=0){ - $user['group_ids'] = $find['group_id']; - $msg=Db::connect('nongke')->table('fa_szxc_information_usermsg')->where('user_id',$find['n_user_id'])->find(); + $user['group_ids'] = $user['group_id']; + $msg=Db::connect('nongke')->table('fa_szxc_information_usermsg')->where('user_id',$user['uid'])->find(); if ($msg){ $user['no_update']=0; $ddd['phone'] = $data['phone']; - Db::connect('nongke')->table('fa_szxc_information_usermsg')->where('user_id',$find['n_user_id'])->update($ddd); + Db::connect('nongke')->table('fa_szxc_information_usermsg')->where('user_id',$user['uid'])->update($ddd); } - } if ($user['phone']==''){ Db::name('user')->where('uid',$user['uid'])->update(['phone'=>$user['account']]); @@ -547,7 +499,6 @@ class Auth extends BaseController if (!isset($userInfo['openId'])) $userInfo['openId'] = $userInfoCong['openid'] ?? ''; $userInfo['unionId'] = $userInfoCong['unionid'] ?? $userInfo['unionId'] ?? ''; if (!$userInfo['openId']) throw new ValidateException('openid获取失败'); - /** @var WechatUserRepository $make */ $make = app()->make(WechatUserRepository::class); $user = $make->syncRoutineUser($userInfo['openId'], $userInfo, $createUser); @@ -630,17 +581,12 @@ class Auth extends BaseController if ($auth['auth']['spread'] ?? 0) { $userRepository->bindSpread($user, (int)($auth['auth']['spread'])); } - $uid = Db::name('user')->where('wechat_user_id',$authInfo['wechat_user_id'])->value('uid'); - $find=Db::name('nk_user')->where('user_id',$uid)->find(); $user['no_update']=1; - $user['group_ids'] = 1; - if ($find && $find['n_user_id']!=0){ - $user['group_ids'] = $find['group_id']; - $msg=Db::connect('nongke')->table('fa_szxc_information_usermsg')->where('user_id',$find['n_user_id'])->cache(true)->find(); + $user['group_ids'] = $user['group_id']; + $msg=Db::connect('nongke')->table('fa_szxc_information_usermsg')->where('user_id',$user['uid'])->cache(true)->find(); if ($msg){ $user['no_update']=0; } - } $tokenInfo = $userRepository->createToken($user); $userRepository->loginAfter($user); diff --git a/app/controller/api/user/User.php b/app/controller/api/user/User.php index 85872c32..f300375e 100644 --- a/app/controller/api/user/User.php +++ b/app/controller/api/user/User.php @@ -303,81 +303,15 @@ class User extends BaseController $dataa = ['account' => $data['phone'], 'phone' => $data['phone']]; } $this->repository->update($this->request->uid(), $dataa); - $msg=Db::connect('nongke')->table('fa_szxc_information_usermsg')->where('phone',$data['phone'])->find(); - //绑定农科用户 - if ($msg){ - $find=Db::name('nk_user')->where('n_user_id',$msg['user_id'])->find(); - $users=Db::connect('nongke')->table('fa_user')->where('id',$msg['user_id'])->find(); - if ($find && $find['user_id']==0){ - Db::name('nk_user')->where('id',$find['id'])->update(['user_id'=>$this->request->uid(),'group_id'=>$users['group_id']]); - }else{ - $nk_user=Db::name('nk_user')->where('user_id',$this->request->uid())->find(); - if (!$nk_user){ - $datas=[ - 'user_id'=>$this->request->uid(), - 'n_user_id'=>$users['id'], - 'group_id'=>$users['group_id'] - ]; - Db::name('nk_user')->insert($datas); - }else{ - Db::name('nk_user')->where('id',$nk_user['id'])->update(['n_user_id'=>$users['id'],'group_id'=>$users['group_id']]); - } - - } - }else{ - $nk_user=Db::name('nk_user')->where('user_id',$this->request->uid())->find(); - if (!$nk_user || $nk_user['n_user_id']==0){ - $time=time(); - $data=[ - 'openid'=>'wx'.$time, - 'group_id'=>1, - 'username'=>'wx'.$time, - 'nickname'=>'微信用户'.$time, - 'avatar'=>'https://lihai001.oss-cn-chengdu.aliyuncs.com/uploads/20230104/32a639be4ee32349705e947fbbd1e114.png', - 'level'=>1, - 'createtime'=>$time, - 'updatetime'=>$time, - 'status'=>'normal' - ]; - $n_user_id= Db::connect('nongke')->table('fa_user')->insertGetId($data); - $datas=[ - 'user_id'=>$this->request->uid(), - 'n_user_id'=>$n_user_id, - 'group_id'=>1 - ]; - Db::name('nk_user')->insert($datas); - } -// $this->NongKeBinding($data); - } return app('json')->success('绑定成功'); } public function NongKeBinding($post){ - $nk_user=Db::name('nk_user')->where('user_id',$this->request->uid())->find(); - if ($nk_user && $nk_user['n_user_id']!=0){ - $user = Db::connect('nongke')->table('fa_user')->where('id',$nk_user['user_id'])->field('id,nickname,group_id,mobile,avatar,username,createtime,score')->find(); - }else{ - $user=false; - } // 已绑定 Db::startTrans(); try { - if (!$user){ - $time=time(); - $data=[ - 'openid'=>'wx'.$time, - 'group_id'=>1, - 'username'=>'wx'.$time, - 'nickname'=>'微信用户'.$time, - 'avatar'=>'https://lihai001.oss-cn-chengdu.aliyuncs.com/uploads/20230104/32a639be4ee32349705e947fbbd1e114.png', - 'level'=>1, - 'createtime'=>$time, - 'updatetime'=>$time, - 'status'=>'normal' - ]; - $post['user_id']= Db::connect('nongke')->table('fa_user')->insertGetId($data); - } - //判断身份证号是否已被使用 + $user=Db::name('user')->where('uid',$this->request->uid())->find(); + //判断身份证号是否已被使用 $InformationUsermsg = Db::connect('nongke')->table('fa_szxc_information_usermsg')->where('idcard',$post['idcard'])->field('idcard')->find(); if ($InformationUsermsg) { return app('json')->fail('身份证号已被使用'); @@ -388,7 +322,7 @@ class User extends BaseController return app('json')->fail('身份证号错误'); } - $userid = $post['user_id']; + $userid = $user['uid']; // 组装地址名 if ($post['area_id'] != '') { @@ -413,7 +347,7 @@ class User extends BaseController $data['gender'] = $this->get_sex($post['idcard']); $data['age'] = $this->getAgeFromIdNo($post['idcard']); $data['marital_status'] = $post['marital_status']; - $data['phone'] = $user['mobile']; + $data['phone'] = $user['phone']; $data['idcard'] = $post['idcard']; $data['address_name'] = $post['address_name']; $data['createtime'] = time(); @@ -436,12 +370,6 @@ class User extends BaseController if (!$add){ Db::connect('nongke')->table('fa_szxc_information_useraddress')->insert($address_data); } - $datas=[ - 'user_id'=>$this->request->uid(), - 'n_user_id'=>$userid, - 'group_id'=>1 - ]; - Db::name('nk_user')->insert($datas); Db::commit(); } catch (ValidateException | PDOException | Exception $e) { Db::rollback(); diff --git a/app/listener/CommunityAddress.php b/app/listener/CommunityAddress.php index b794b394..a87f1dc7 100644 --- a/app/listener/CommunityAddress.php +++ b/app/listener/CommunityAddress.php @@ -15,8 +15,7 @@ class CommunityAddress */ public function handle($event) { - $finds = Db::name('nk_user')->where('user_id', $event['uid'])->find(); - $find = Db::connect('nongke')->table('fa_szxc_information_useraddress')->where('user_id', $finds['n_user_id'])->find(); + $find = Db::connect('nongke')->table('fa_szxc_information_useraddress')->where('user_id', $event['uid'])->find(); if ($find ) { $data = [ 'user_id' => $event['uid'],