|
@@ -10,6 +10,7 @@ from django.utils.timezone import utc
|
|
|
from django.views.decorators.csrf import csrf_exempt
|
|
|
from django.views.generic import TemplateView
|
|
|
|
|
|
+from AgentModel.models import AgentCustomerInfo,AgentCustomerCard
|
|
|
from Ansjer.config import SERVER_DOMAIN, OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, AWS_ACCESS_KEY_ID, \
|
|
|
AWS_SECRET_ACCESS_KEY, AWS_SES_ACCESS_REGION, DETECT_PUSH_DOMAINS
|
|
|
from Controller.CheckUserData import DataValid, RandomStr
|
|
@@ -448,16 +449,24 @@ class UserManagement(View):
|
|
|
return response.json(103)
|
|
|
role_qs = Role.objects.filter(roleName=roleName) # 账号角色
|
|
|
# 创建用户
|
|
|
+ new_userID = CommonService.getUserID(μs=False, setOTAID=True)
|
|
|
user_data = {
|
|
|
"username": username,
|
|
|
"NickName": username,
|
|
|
"userEmail": userEmail,
|
|
|
"password": password,
|
|
|
- "userID": CommonService.getUserID(μs=False, setOTAID=True),
|
|
|
+ "userID": new_userID,
|
|
|
"is_active": True,
|
|
|
"user_isValid": True,
|
|
|
}
|
|
|
Device_User.objects.create(**user_data).role.set(role_qs)
|
|
|
+ if isAgent:
|
|
|
+ if not all([agent_company_name, agent_name]):
|
|
|
+ return response.json(444)
|
|
|
+ agent_customer_info = AgentCustomerInfo.objects.create(user_id=new_userID, company_name=agent_company_name, status=1, created_time=int(time.time()),
|
|
|
+ updated_time=int(time.time()), created_by=userID, updated_by=userID)
|
|
|
+ AgentCustomerCard.objects.create(ac_id=agent_customer_info.id, name=username, card_no=card_no, card_address=card_address, status=1,
|
|
|
+ created_time=int(time.time()), updated_time=int(time.time()), created_by=userID, updated_by=userID)
|
|
|
return response.json(0)
|
|
|
except Exception as e:
|
|
|
print(e)
|