group/models.py

@@ -58,7 +58,7 @@ class GroupInfo(CreateUpdateMixin):

                         }
              

                 
              

                     def users(self, admin=True, user_id=None):
              

                -        all_users = GroupUserInfo.objects.filter(group_id=self.group_id)
              

                +        all_users = GroupUserInfo.objects.filter(group_id=self.group_id, user_status__in=[GroupUserInfo.APPLYING, GroupUserInfo.PASSED])
              

                 
              

                         passed_users = all_users.filter(user_status=GroupUserInfo.PASSED)
              

                         passed_count = passed_users.count()
              

group/views.py

@@ -357,7 +357,7 @@ def group_remove_api(request):

                     group_user.save()
              

                 
              

                     # Redis 群组数据缓存更新
              

                -    group_users = set_group_info(group)
              

                +    group_users = set_group_users_info(group)
              

                 
              

                     # Redis 群组删除集合缓存
              

                     r.srem(GROUP_USERS_PASSED_SET % group_id, user_id)
              

utils/redis/retrieve.py

@@ -5,7 +5,8 @@ import json

                 from django.conf import settings
              

                 
              

                 from group.models import GroupInfo, GroupPhotoInfo, GroupUserInfo
              

                -from utils.redis.rkeys import (GROUP_LAST_PHOTO_PK, GROUP_PHOTO_DATA, GROUP_USERS_APPLYING_SET, GROUP_USERS_DELETED_SET,
              

                +from utils.redis.rgroup import set_group_photo_data, set_group_users_info
              

                +from utils.redis.rkeys import (GROUP_LAST_PHOTO_PK, GROUP_USERS_APPLYING_SET, GROUP_USERS_DELETED_SET,
              

                                                GROUP_USERS_PASSED_SET, GROUP_USERS_REFUSED_SET)
              

                 
              

                 
              
@@ -16,9 +17,10 @@ def retrieve_group_data():

                     """ 群组数据 """
              

                     groups = GroupInfo.objects.filter(status=True)
              

                     for group in groups:
              

                -        group_photos = GroupPhotoInfo.objects.filter(group_id=group.group_id, status=True)
              

                -        group_photos = [photo.photo_data for photo in group_photos]
              

                -        r.set(GROUP_PHOTO_DATA % group.group_id, json.dumps(group_photos))
              

                +        # 群组照片
              

                +        set_group_photo_data(group.group_id)
              

                +        # 群组用户
              

                +        set_group_users_info(group)
              

                 
              

                 
              

                 def retrieve_last_pk():