|
|
|
@@ -13,7 +13,6 @@ from TimeConvert import TimeConvert as tc
|
|
13
|
13
|
from coupon.models import CouponInfo
|
|
14
|
14
|
from kodo.basemodels import BrandInfoMixin
|
|
15
|
15
|
from mch.models import ModelInfo
|
|
16
|
|
-from account.models import LensmanInfo
|
|
17
|
16
|
from simditor.fields import RichTextField
|
|
18
|
17
|
from utils.qiniucdn import qiniu_file_url
|
|
19
|
18
|
|
|
|
|
@@ -998,12 +997,7 @@ class MemberActivityContributionInfo(BaseModelMixin, BrandInfoMixin):
|
|
998
|
997
|
def admindata(self):
|
|
999
|
998
|
unlock_welfares = MemberActivityContributionWelfareUnlockingInfo.objects.filter(activity_id=self.activity_id, user_id=self.user_id)
|
|
1000
|
999
|
unlock_welfares = [unlock_welfare.data for unlock_welfare in unlock_welfares]
|
|
1001
|
|
- act = MemberActivityInfo.objects.get(activity_id=self.activity_id, status=True)
|
|
1002
|
|
-
|
|
1003
|
|
- if act.activity_type == 4:
|
|
1004
|
|
- user_name = LensmanInfo.objects.get(user_id=self.user_id, status=True).name
|
|
1005
|
|
- else:
|
|
1006
|
|
- user_name = self.user_name
|
|
|
1000
|
+
|
|
1007
|
1001
|
return {
|
|
1008
|
1002
|
'contribution_id': self.contribution_id,
|
|
1009
|
1003
|
'brand_id': self.brand_id,
|
|
|
|
@@ -1014,7 +1008,7 @@ class MemberActivityContributionInfo(BaseModelMixin, BrandInfoMixin):
|
|
1014
|
1008
|
'content_type': self.content_type,
|
|
1015
|
1009
|
'title': self.title,
|
|
1016
|
1010
|
'content': self.content,
|
|
1017
|
|
- 'user_name': user_name,
|
|
|
1011
|
+ 'user_name': self.user_name,
|
|
1018
|
1012
|
'user_avatar': self.final_user_avatar,
|
|
1019
|
1013
|
'images': self.final_images,
|
|
1020
|
1014
|
'video_url': self.video_url or '',
|
FFIB