diff --git a/users/paihang_views.py b/users/paihang_views.py index 37399c4..63b2f20 100644 --- a/users/paihang_views.py +++ b/users/paihang_views.py @@ -17,7 +17,7 @@ from backend.models import ( LeaderDailyStats, MerchantDailyStats, ) -from users.models import UserDashou, UserShangjia, UserBoss, UserGuanshi +from users.models import UserDashou, UserShangjia, UserGuanshi, UserZuzhang from users.business_models import User logger = logging.getLogger(__name__) @@ -102,7 +102,7 @@ TODAY_PROFILE_CONFIG = { }, }, 'zuzhang': { - 'profile_model': UserBoss, + 'profile_model': UserZuzhang, 'profile_sort_field': 'jinri_fenyong', 'field_map': { 'InvitedManagerCount': None, @@ -314,15 +314,15 @@ class PhbHqsjView(APIView): users = User.objects.filter(UserUID__in=yonghuids) 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': 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': for p in UserShangjia.objects.filter(user__UserUID__in=yonghuids).select_related('user'): - nick_map[p.user.UserUID] = p.nicheng or '用户' - else: - for b in UserBoss.objects.filter(user__UserUID__in=yonghuids).select_related('user'): - nick_map[b.user.UserUID] = b.nickname or '用户' + if p.nicheng: + nick_map[p.user.UserUID] = p.nicheng return nick_map, avatar_map