XingQue/Django
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正了 SDK，修复了 aggregate 不能传入 args 的问题

Browse Source
This commit is contained in:
TermiNexus
2026-06-19 18:57:50 +08:00
parent fcd2a5e8a9
commit ee42d80d93
27 changed files with 622 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
users/models.py
View File

@@ -91,7 +91,7 @@ class OfficialAccountUser(QModel):
# ==================== 老板扩展表 ====================
class UserBoss(QModel):
user = models.OneToOneField('gvsdsdk.User', on_delete=models.CASCADE, related_name='BossProfile',
user = models.OneToOneField('users.User', on_delete=models.CASCADE, related_name='BossProfile',
verbose_name='关联用户', db_column='UserUUID')
nickname = models.CharField(max_length=50, verbose_name='老板昵称')
zonge = models.DecimalField(max_digits=12, decimal_places=2, default=0.00, verbose_name='消费总额')
@@ -108,7 +108,7 @@ class UserBoss(QModel):
# ==================== 打手扩展表 ====================
class UserDashou(QModel):
user = models.OneToOneField('gvsdsdk.User', on_delete=models.CASCADE, related_name='DashouProfile',
user = models.OneToOneField('users.User', on_delete=models.CASCADE, related_name='DashouProfile',
verbose_name='关联用户', db_column='UserUUID')
nicheng = models.CharField(max_length=50, null=True, verbose_name='打手昵称')
chenghao = models.CharField(max_length=50, null=True,verbose_name='打手称号')
@@ -152,7 +152,7 @@ class UserDashou(QModel):
# ==================== 商家扩展表 ====================
class UserShangjia(QModel):
user = models.OneToOneField('gvsdsdk.User', on_delete=models.CASCADE, related_name='ShopProfile',
user = models.OneToOneField('users.User', on_delete=models.CASCADE, related_name='ShopProfile',
verbose_name='关联用户', db_column='UserUUID')
nicheng = models.CharField(max_length=50, unique=True, db_index=True, verbose_name='商家昵称')
zhuangtai = models.IntegerField(choices=[(0, '待审核'), (1, '正常'), (2, '禁用')], default=1,
@@ -181,7 +181,7 @@ class UserShangjia(QModel):
# ==================== 管事扩展表 ====================
class UserGuanshi(QModel):
user = models.OneToOneField('gvsdsdk.User', on_delete=models.CASCADE, related_name='GuanshiProfile',
user = models.OneToOneField('users.User', on_delete=models.CASCADE, related_name='GuanshiProfile',
verbose_name='关联用户', db_column='UserUUID')
yaoqingren = models.CharField(max_length=7,null=True, db_index=True, verbose_name='邀请人ID')
yaoqingma = models.CharField(max_length=20,null=True,db_index=True, verbose_name='邀请码')
@@ -224,7 +224,7 @@ class UserGuanshi(QModel):
class UserZuzhang(QModel):
"""组长扩展表（与UserMain一对一关联）"""
user = models.OneToOneField(
'gvsdsdk.User',
'users.User',
on_delete=models.CASCADE,
related_name='ZuzhangProfile',
verbose_name='关联用户',
@@ -278,7 +278,7 @@ class UserZuzhang(QModel):
class UserShenheguan(QModel):
"""审核官扩展表（与UserMain一对一关联）"""
user = models.OneToOneField('gvsdsdk.User', on_delete=models.CASCADE, related_name='ShenheguanProfile', verbose_name='关联用户', db_index=True, db_column='UserUUID')
user = models.OneToOneField('users.User', on_delete=models.CASCADE, related_name='ShenheguanProfile', verbose_name='关联用户', db_index=True, db_column='UserUUID')
zhuangtai = models.IntegerField(choices=[(0, '禁用'), (1, '正常')], default=1, verbose_name='账号状态')
shenhe_zhuangtai = models.IntegerField(choices=[(0, '空闲'), (1, '审核中')], default=0, verbose_name='审核官状态')
is_renzheng = models.BooleanField(default=False, verbose_name='是否认证')
@@ -298,7 +298,7 @@ class UserShenheguan(QModel):
# ==================== 管理员扩展表 ====================
class AdminProfile(QModel):
user = models.OneToOneField('gvsdsdk.User', on_delete=models.CASCADE, related_name='AdminProfile',
user = models.OneToOneField('users.User', on_delete=models.CASCADE, related_name='AdminProfile',
verbose_name='关联用户', db_column='UserUUID')
password = models.CharField(max_length=255, verbose_name='密码')
wechat = models.CharField(max_length=50, blank=True, verbose_name='管理员微信')
@@ -313,7 +313,7 @@ class AdminProfile(QModel):
class UserKefu(QModel):
user = models.OneToOneField('gvsdsdk.User', on_delete=models.CASCADE, related_name='KefuProfile', verbose_name='关联用户', db_column='UserUUID')
user = models.OneToOneField('users.User', on_delete=models.CASCADE, related_name='KefuProfile', verbose_name='关联用户', db_column='UserUUID')
nicheng = models.CharField(max_length=50, verbose_name='客服昵称')
erjimima = models.CharField(max_length=128, verbose_name='二级密码')
zhuangtai = models.IntegerField(choices=[(0, '禁用'), (1, '正常')], default=1, verbose_name='客服状态')
@@ -604,7 +604,7 @@ class RankingRecord(QModel):
class UserSensitiveData(QModel):
"""用户敏感数据表——独立存储敏感信息，不继承 gvsdsdk"""
user_uuid = models.OneToOneField(
'gvsdsdk.User',
'users.User',
on_delete=models.CASCADE,
related_name='sensitive_data',
verbose_name='关联用户',
@@ -627,3 +627,9 @@ class UserSensitiveData(QModel):
return f'敏感数据-{self.user_uuid_id}'
# === 业务用户模型注册 ===
# 导入业务子类，使 Django app registry 注册具体 User 模型（users.User）。
# 放在文件末尾以避免循环导入：此时本模块所有类已定义完毕。
from users.business_models import User as _BusinessUser # noqa: E402,F401