From 1d54c2cc54a38830745bf5eba1f1df46516e8655 Mon Sep 17 00:00:00 2001
From: chuan <2154243450@qq.com>
Date: Wed, 11 Jun 2025 20:59:31 +0800
Subject: [PATCH] up

---
 app/home/service/LoginService.php      |  8 ----
 app/home/service/UserVerifyService.php | 56 +++++++++++++-------------
 2 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/app/home/service/LoginService.php b/app/home/service/LoginService.php
index 0cbbe635..4c3dc0ef 100644
--- a/app/home/service/LoginService.php
+++ b/app/home/service/LoginService.php
@@ -439,15 +439,7 @@ class LoginService extends BaseHomeService
             if (empty($param['email'])) {
                 return $this->toData('400', lang('parameter_error'));
             }
-
-            // 是否上传了实名认证信息，上传了实名认证信息时is_verify=1，否则is_verify=0
             $isVerify = $param['is_verify'] ?? 0;
-            if ($isVerify == 1) {
-                if (empty($param['verify_name']) || empty($param['verify_surname']) || empty($param['verify_code']) || empty($param['verify_front_img']) || empty($param['verify_country']) || empty($param['verify_birth_day']) || empty($param['verify_gender'])
-                   || empty($param['verify_email'])) {
-                    return $this->toData('400', lang('parameter_error'));
-                }
-            }
 
             // 短信注册参数校验
             validate(LoginValidate::class)->scene('smsRegister')->check($param);
diff --git a/app/home/service/UserVerifyService.php b/app/home/service/UserVerifyService.php
index 02032b9a..5205310a 100644
--- a/app/home/service/UserVerifyService.php
+++ b/app/home/service/UserVerifyService.php
@@ -16,21 +16,21 @@ class UserVerifyService extends BaseHomeService
     {
         try {
             // 参数校验
-            if(empty($params['surname']) || !is_string($params['surname'])){
-                return $this->toData('400', lang('parameter_error'));
-            }
+//            if(empty($params['surname']) || !is_string($params['surname'])){
+//                return $this->toData('400', lang('parameter_error'));
+//            }
 
             if(empty($params['name']) || !is_string($params['name'])){
                 return $this->toData('400', lang('parameter_error'));
             }
 
-            if(empty($params['code']) || !is_string($params['code'])){
-                return $this->toData('400', lang('parameter_error'));
-            }
+//            if(empty($params['code']) || !is_string($params['code'])){
+//                return $this->toData('400', lang('parameter_error'));
+//            }
 
-            if(empty($params['country']) || !is_numeric($params['country'])){
-                return $this->toData('400', lang('parameter_error'));
-            }
+//            if(empty($params['country']) || !is_numeric($params['country'])){
+//                return $this->toData('400', lang('parameter_error'));
+//            }
 
             if(empty($params['front_img'])){
                 return $this->toData('400', lang('parameter_error'));
@@ -48,12 +48,12 @@ class UserVerifyService extends BaseHomeService
 //            if (empty($params['zip_code'])) {
 //                return $this->toData('400','zip_code 参数无效');
 //            }
-            if (empty($params['email'])) {
-                return $this->toData('400', lang('parameter_error'));
-            }
-            if (empty($params['email_code'])) {
-                return $this->toData('400', lang('parameter_error'));
-            }
+//            if (empty($params['email'])) {
+//                return $this->toData('400', lang('parameter_error'));
+//            }
+//            if (empty($params['email_code'])) {
+//                return $this->toData('400', lang('parameter_error'));
+//            }
 
 //            if(empty($params['back_img']) || !is_numeric($params['back_img'])){
 //                return $this->toData('100400','Invalid back_img');
@@ -75,24 +75,26 @@ class UserVerifyService extends BaseHomeService
                 return $this->toData('500','status error');
             }
 
-            $country = CountryModel::where('id',$params['country'])->find();
-            if(empty($country)){
-                return $this->toData('500','country error');
+            if (!empty($params['country'])) {
+                $country = CountryModel::where('id',$params['country'])->find();
+                if(empty($country)){
+                    return $this->toData('500','country error');
+                }
             }
 
             // 验证邮箱
-            $emailKey = 'USER:sendEmailLoginNoTrade:' . $params['email'];
-            $cacheCode = Cache::store('redis')->get($emailKey);
-            if (empty($cacheCode) || $cacheCode != $params['email_code']) {
-                return $this->toData('500', lang('incorrect_verification_code'));
-            }
+//            $emailKey = 'USER:sendEmailLoginNoTrade:' . $params['email'];
+//            $cacheCode = Cache::store('redis')->get($emailKey);
+//            if (empty($cacheCode) || $cacheCode != $params['email_code']) {
+//                return $this->toData('500', lang('incorrect_verification_code'));
+//            }
 
             // 写入数据库
             $userVerify = new UserVerifyLogModel;
             $userVerify->user_id = $userId;
-            $userVerify->country = $params['country'];
-            $userVerify->code = $params['code'];
-            $userVerify->surname = $params['surname'];
+            $userVerify->country = $params['country'] ?? 0;
+            $userVerify->code = $params['code'] ?? '';
+            $userVerify->surname = $params['surname'] ?? '';
             $userVerify->name = $params['name'];
             $userVerify->front_img = $params['front_img'];
             $userVerify->back_img = $params['back_img'] ?? "";
@@ -102,7 +104,7 @@ class UserVerifyService extends BaseHomeService
             $userVerify->gender = $params['gender'];
 //            $userVerify->addr = $params['addr'];
 //            $userVerify->zip_code = $params['zip_code'];
-            $userVerify->email = $params['email'];
+            $userVerify->email = $params['email'] ?? '';
             $userVerify->save();
 
             // 更改用户状态