From 34edc89c95308f5cc1d037547b5888fd2fdda910 Mon Sep 17 00:00:00 2001
From: ping <1017253325@qq.com>
Date: Thu, 11 Sep 2025 18:18:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=94=B9=E9=80=A0=20?=
 =?UTF-8?q?=E5=BF=BD=E7=95=A5=E7=94=A8=E6=88=B7=E5=90=8D=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E9=AA=8C=E8=AF=81=E7=A0=81codeid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 b/customer/registerUser.dspy | 39 ++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/b/customer/registerUser.dspy b/b/customer/registerUser.dspy
index 0ead1a8..9c78a74 100644
--- a/b/customer/registerUser.dspy
+++ b/b/customer/registerUser.dspy
@@ -5,20 +5,36 @@ async def registerUser(ns):
     db = DBPools()
     async with db.sqlorContext('kboss') as sor:
         if ns:
-            userns = {'username': ns['username']}
-            isuser = await sor.R('users', userns)
-            if len(isuser) >= 1:
-                return {'status': False, 'msg': '用户名已注册'}
-            useremai = {'email': ns['email']}
-            isuser = await sor.R('users', useremai)
-            if len(isuser) >= 1:
-                return {'status': False, 'msg': '该邮箱已注册'}
+            if ns.get('username'):
+                userns = {'username': ns['username']}
+                isuser = await sor.R('users', userns)
+                if len(isuser) >= 1:
+                    return {'status': False, 'msg': '用户名已注册'}
+            
+            if ns.get('email'):
+                useremai = {'email': ns['email']}
+                isuser = await sor.R('users', useremai)
+                if len(isuser) >= 1:
+                    return {'status': False, 'msg': '该邮箱已注册'}
+            
             usermobile = {'mobile':ns['mobile']}
             isuser = await sor.R('users', usermobile)
             if len(isuser) >= 1:
                 return {'status': False, 'msg': '该手机号已注册'}
-            if len(ns.get('password')) < 6:
-                return {'status': False, 'msg': '密码必须6位数以上'}
+            # 用户名没有 则用手机号作为用户名
+            if not ns.get('username'):
+                ns['username'] = ns['mobile']
+            
+            if ns.get('password'):
+                if len(ns.get('password')) < 6:
+                    return {'status': False, 'msg': '密码必须6位数以上'}
+                
+            if ns.get('codeid'):
+                type += 1
+                code = await sor.R('validatecode', {'id': ns.get('codeid'), 'vcode': ns.get('vcode')})
+                if len(code) < 1:
+                    return {'status': False, 'msg': '验证码不正确'}
+            
             #通过邀请码注册
             if ns.get('invitecode'):
                 invitecodens = {}
@@ -124,7 +140,8 @@ async def registerUser(ns):
                     userid = ns['id']
                     
                     # 加密用户密码
-                    ns['password'] = password_encode(ns['password'])
+                    if ns.get('password'):
+                        ns['password'] = password_encode(ns['password'])
                     ns['orgid'] = org_id
                     
                     # 新增用户信息