| @@ -236,3 +236,14 @@ def activity_contribute_detail(request): | ||
| 236 | 236 | return response(MemberActivityContributionStatusCode.ACTIVITY_CONTRIBUTION_NOT_FOUND) | 
| 237 | 237 |  | 
| 238 | 238 | return response(data=contribution.data) | 
| 239 | + | |
| 240 | + | |
| 241 | +@logit | |
| 242 | +def activity_contribute_detail_lastest(request): | |
| 243 | +    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID | |
| 244 | +    user_id = request.POST.get('user_id', '') | |
| 245 | +    activity_id = request.POST.get('activity_id', '') | |
| 246 | + | |
| 247 | + contribution = MemberActivityContributionInfo.objects.filter(activity_id=activity_id, user_id=user_id, status=True).first() | |
| 248 | + | |
| 249 | + return response(data=contribution.data) | 
| @@ -500,6 +500,10 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin): | ||
| 500 | 500 | # 是否已报名 | 
| 501 | 501 | return MemberActivityContributionInfo.objects.filter(user_id=user_id, activity_id=self.activity_id, status=True, is_selected=True, audit_status=1, content_type=0).exists() | 
| 502 | 502 |  | 
| 503 | + def is_contributed(self, user_id): | |
| 504 | + # 是否投稿 | |
| 505 | + return MemberActivityContributionInfo.objects.filter(user_id=user_id, activity_id=self.activity_id, status=True).exists() | |
| 506 | + | |
| 503 | 507 | @property | 
| 504 | 508 | def welfares(self): | 
| 505 | 509 | try: | 
| @@ -550,6 +554,7 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin): | ||
| 550 | 554 | 'state': self.final_state, | 
| 551 | 555 | 'is_signed': self.is_signed(user_id), | 
| 552 | 556 | 'is_selected': self.is_selected(user_id), | 
| 557 | + 'is_contributed': self.is_contributed(user_id), | |
| 553 | 558 | 'is_signup': self.is_signup, | 
| 554 | 559 | 'share_integral': self.group_share_integral, | 
| 555 | 560 | 'share_max_integral': self.group_share_max_integral, | 
| @@ -594,6 +599,7 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin): | ||
| 594 | 599 | 'state': self.final_state, | 
| 595 | 600 | 'is_signed': self.is_signed(user_id), | 
| 596 | 601 | 'is_selected': self.is_selected(user_id), | 
| 602 | + 'is_contributed': self.is_contributed(user_id), | |
| 597 | 603 | 'is_signup': self.is_signup, | 
| 598 | 604 | 'share_integral': self.group_share_integral, | 
| 599 | 605 | 'share_max_integral': self.group_share_max_integral, | 
| @@ -23,4 +23,6 @@ urlpatterns += [ | ||
| 23 | 23 | url(r'^member/activity/contribute/list$', activity_mp_views.activity_contribute_list, name='member_activity_contribute_list'), | 
| 24 | 24 | url(r'^member/activity/contribute/update$', activity_mp_views.activity_contribute_update, name='member_aactivity_contribute_update'), | 
| 25 | 25 | url(r'^member/activity/contribute/detail$', activity_mp_views.activity_contribute_detail, name='member_activity_contribute_detail'), | 
| 26 | + | |
| 27 | + url(r'^member/activity/contribute/detail/lastest$', activity_mp_views.activity_contribute_detail_lastest, name='member_activity_contribute_detail_lastest'), | |
| 26 | 28 | ] |