api/admin_views.py

@@ -1171,7 +1171,6 @@ def member_activity_contribute_welfare_unlock(request, administrator):

                             'contribution_id': contribution_id,
              

                             'welfare_type': welfare.welfare_type,
              

                             'welfare_value': welfare.welfare_value,
              

                -            'is_handled': False,
              

                         }
              

                     )
              

                 
              
@@ -1220,6 +1219,7 @@ def member_activity_contribute_welfare_unlocking_list(request, administrator):

                     activity_id = request.POST.get('activity_id', '')
              

                     contribution_id = request.POST.get('contribution_id', '')
              

                     welfare_id = request.POST.get('welfare_id', '')
              

                +    query = request.POST.get('query', '')
              

                     page = request.POST.get('page', 1)
              

                     num = request.POST.get('num', 20)
              

                 
              
@@ -1232,6 +1232,9 @@ def member_activity_contribute_welfare_unlocking_list(request, administrator):

                         unlockings = unlockings.filter(contribution_id=contribution_id)
              

                     if welfare_id:
              

                         unlockings = unlockings.filter(welfare_id=welfare_id)
              

                +    if query:
              

                +        unlockings = unlockings.filter(Q(name__icontains=query) | Q(phone__icontains=query))
              

                +
              

                     unlockings = unlockings.order_by('-pk')
              

                     count = unlockings.count()
              

                     unlockings, left = pagination(unlockings, page, num)
              

member/models.py

@@ -925,6 +925,12 @@ class MemberActivityContributionWelfareUnlockingInfo(BaseModelMixin, BrandInfoMi

                             welfare = MemberActivityContributionWelfareInfo.objects.get(welfare_id=self.welfare_id)
              

                         except MemberActivityContributionWelfareInfo.DoesNotExist:
              

                             welfare = None
              

                +        
              

                +        try:
              

                +            user = MemberActivitySignupInfo.objects.get(user_id=self.user_id, activity_id=self.activity_id)
              

                +        except MemberActivitySignupInfo.DoesNotExist:
              

                +            user = None
              

                +
              

                         return {
              

                             'unlocking_id': self.unlocking_id,
              

                             'brand_id': self.brand_id,
              
@@ -941,4 +947,7 @@ class MemberActivityContributionWelfareUnlockingInfo(BaseModelMixin, BrandInfoMi

                             'tracking_number': self.tracking_number,
              

                             'is_handled': self.is_handled,
              

                             'created_at': tc.local_string(utc_dt=self.created_at),
              

                +
              

                +            'username': user.name if user else '',
              

                +            'useravatar': user.avatar if user else '',
              

                         }