fix: zuzhang rank today query uses UserZuzhang not UserBoss
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -17,7 +17,7 @@ from backend.models import (
|
|||||||
LeaderDailyStats,
|
LeaderDailyStats,
|
||||||
MerchantDailyStats,
|
MerchantDailyStats,
|
||||||
)
|
)
|
||||||
from users.models import UserDashou, UserShangjia, UserBoss, UserGuanshi
|
from users.models import UserDashou, UserShangjia, UserGuanshi, UserZuzhang
|
||||||
from users.business_models import User
|
from users.business_models import User
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
@@ -102,7 +102,7 @@ TODAY_PROFILE_CONFIG = {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
'zuzhang': {
|
'zuzhang': {
|
||||||
'profile_model': UserBoss,
|
'profile_model': UserZuzhang,
|
||||||
'profile_sort_field': 'jinri_fenyong',
|
'profile_sort_field': 'jinri_fenyong',
|
||||||
'field_map': {
|
'field_map': {
|
||||||
'InvitedManagerCount': None,
|
'InvitedManagerCount': None,
|
||||||
@@ -314,15 +314,15 @@ class PhbHqsjView(APIView):
|
|||||||
users = User.objects.filter(UserUID__in=yonghuids)
|
users = User.objects.filter(UserUID__in=yonghuids)
|
||||||
avatar_map = {u.UserUID: u.Avatar or '' for u in users}
|
avatar_map = {u.UserUID: u.Avatar or '' for u in users}
|
||||||
|
|
||||||
nick_map = {}
|
nick_map = {u.UserUID: u.UserName or u.Phone or '用户' for u in users}
|
||||||
|
|
||||||
if shenfen == 'dashou':
|
if shenfen == 'dashou':
|
||||||
for p in UserDashou.objects.filter(user__UserUID__in=yonghuids).select_related('user'):
|
for p in UserDashou.objects.filter(user__UserUID__in=yonghuids).select_related('user'):
|
||||||
nick_map[p.user.UserUID] = p.nicheng or '用户'
|
if p.nicheng:
|
||||||
|
nick_map[p.user.UserUID] = p.nicheng
|
||||||
elif shenfen == 'shangjia':
|
elif shenfen == 'shangjia':
|
||||||
for p in UserShangjia.objects.filter(user__UserUID__in=yonghuids).select_related('user'):
|
for p in UserShangjia.objects.filter(user__UserUID__in=yonghuids).select_related('user'):
|
||||||
nick_map[p.user.UserUID] = p.nicheng or '用户'
|
if p.nicheng:
|
||||||
else:
|
nick_map[p.user.UserUID] = p.nicheng
|
||||||
for b in UserBoss.objects.filter(user__UserUID__in=yonghuids).select_related('user'):
|
|
||||||
nick_map[b.user.UserUID] = b.nickname or '用户'
|
|
||||||
|
|
||||||
return nick_map, avatar_map
|
return nick_map, avatar_map
|
||||||
|
|||||||
Reference in New Issue
Block a user