member/models.py

@@ -11,7 +11,6 @@ from shortuuidfield import ShortUUIDField

                 from TimeConvert import TimeConvert as tc
              

                 
              

                 from coupon.models import CouponInfo
              

                -from account.models import LensmanInfo
              

                 from kodo.basemodels import BrandInfoMixin
              

                 from mch.models import ModelInfo
              

                 from simditor.fields import RichTextField
              
@@ -996,14 +995,16 @@ class MemberActivityContributionInfo(BaseModelMixin, BrandInfoMixin):

                 
              

                     @property
              

                     def admindata(self):
              

                +        from account.models import LensmanInfo
              

                +
              

                         unlock_welfares = MemberActivityContributionWelfareUnlockingInfo.objects.filter(activity_id=self.activity_id, user_id=self.user_id)
              

                         unlock_welfares = [unlock_welfare.data for unlock_welfare in unlock_welfares]
              

                 
              

                -        # try:
              

                -        #     lensman = LensmanInfo.objects.get(user_id=self.user_id, lensman_status=LensmanInfo.ACTIVATED)
              

                -        #     lensman_name = lensman.name
              

                -        # except LensmanInfo.DoesNotExist:
              

                -        #     lensman_name = ''
              

                +        try:
              

                +            lensman = LensmanInfo.objects.get(user_id=self.user_id, lensman_status=LensmanInfo.ACTIVATED)
              

                +            lensman_name = lensman.name
              

                +        except LensmanInfo.DoesNotExist:
              

                +            lensman_name = ''
              

                     
              

                         return {
              

                             'contribution_id': self.contribution_id,
              
@@ -1015,7 +1016,7 @@ class MemberActivityContributionInfo(BaseModelMixin, BrandInfoMixin):

                             'content_type': self.content_type,
              

                             'title': self.title,
              

                             'content': self.content,
              

                -            'user_name': self.user_name,
              

                +            'user_name': lensman_name if lensman_name else self.user_name,
              

                             'user_avatar': self.final_user_avatar,
              

                             'images': self.final_images,
              

                             'video_url': self.video_url or '',