+ if user_id != unlocking.user_id:
+ return response(PermissionStatusCode.PERMISSION_DENIED)
+
+ unlocking.is_handled = True
+ unlocking.save()
+
+ return response(200, 'Update Member Activity Contribute Welfare Unblocking Success', u'处理会员活动投稿福利解锁成功')
@@ -175,11 +175,13 @@ urlpatterns += [ |
||
| 175 | 175 |
url(r'^admin/member/activity/contribute/audit$', admin_views.member_activity_contribute_audit, name='admin_member_activity_contribute_audit'), |
| 176 | 176 |
url(r'^admin/member/activity/contribute/selected$', admin_views.member_activity_contribute_selected, name='admin_member_activity_contribute_selected'), |
| 177 | 177 |
|
| 178 |
- url(r'^admin/member/activity/contribute/welfare/list$', admin_views.member_activity_contribute_welfare_list, name='member_activity_contribute_welfare_list'), |
|
| 179 |
- url(r'^admin/member/activity/contribute/welfare/detail$', admin_views.member_activity_contribute_welfare_detail, name='member_activity_contribute_welfare_detail'), |
|
| 180 |
- url(r'^admin/member/activity/contribute/welfare/update$', admin_views.member_activity_contribute_welfare_update, name='member_activity_contribute_welfare_update'), |
|
| 181 |
- url(r'^admin/member/activity/contribute/welfare/create$', admin_views.member_activity_contribute_welfare_create, name='member_activity_contribute_welfare_create'), |
|
| 182 |
- url(r'^admin/member/activity/contribute/welfare/unlock$', admin_views.member_activity_contribute_welfare_unlock, name='member_activity_contribute_welfare_unlock'), |
|
| 178 |
+ url(r'^admin/member/activity/contribute/welfare/list$', admin_views.member_activity_contribute_welfare_list, name='admin_member_activity_contribute_welfare_list'), |
|
| 179 |
+ url(r'^admin/member/activity/contribute/welfare/detail$', admin_views.member_activity_contribute_welfare_detail, name='admin_member_activity_contribute_welfare_detail'), |
|
| 180 |
+ url(r'^admin/member/activity/contribute/welfare/update$', admin_views.member_activity_contribute_welfare_update, name='admin_member_activity_contribute_welfare_update'), |
|
| 181 |
+ url(r'^admin/member/activity/contribute/welfare/create$', admin_views.member_activity_contribute_welfare_create, name='admin_member_activity_contribute_welfare_create'), |
|
| 182 |
+ url(r'^admin/member/activity/contribute/welfare/unlock$', admin_views.member_activity_contribute_welfare_unlock, name='admin_member_activity_contribute_welfare_unlock'), |
|
| 183 |
+ url(r'^admin/member/activity/contribute/welfare/unlocking/list$', admin_views.member_activity_contribute_welfare_unlocking_list, name='admin_member_activity_contribute_welfare_unlocking_list'), |
|
| 184 |
+ url(r'^admin/member/activity/contribute/welfare/unlocking/update$', admin_views.member_activity_contribute_welfare_unlocking_update, name='admin_member_activity_contribute_welfare_unlocking_update'), |
|
| 183 | 185 |
|
| 184 | 186 |
url(r'^admin/coupon/list$', admin_views.coupon_list, name='coupon_list'), |
| 185 | 187 |
url(r'^admin/coupon/details$', admin_views.coupon_detail, name='coupon_detail'), |
@@ -242,6 +244,10 @@ urlpatterns += [ |
||
| 242 | 244 |
url(r'^member/activity/contribute/list$', member_views.activity_contribute_list, name='member_activity_contribute_list'), |
| 243 | 245 |
url(r'^member/activity/contribute/detail$', member_views.activity_contribute_detail, name='member_activity_contribute_detail'), |
| 244 | 246 |
|
| 247 |
+ url(r'^member/activity/contribute/welfare/unlocking/list$', member_views.activity_contribute_welfare_unlocking_list, name='member_activity_contribute_welfare_unlocking_list'), |
|
| 248 |
+ url(r'^member/activity/contribute/welfare/unlocking/update$', member_views.activity_contribute_welfare_unlocking_update, name='member_activity_contribute_welfare_unlocking_update'), |
|
| 249 |
+ url(r'^member/activity/contribute/welfare/unlocking/handled$', member_views.activity_contribute_welfare_unlocking_handled, name='member_activity_contribute_welfare_unlocking_handled'), |
|
| 250 |
+ |
|
| 245 | 251 |
url(r'^rights$', member_views.rights, name='rights'), |
| 246 | 252 |
url(r'^right/detail$', member_views.right_detail, name='right_detail'), |
| 247 | 253 |
url(r'^goods$', member_views.goods, name='goods'), |
@@ -792,6 +792,10 @@ class MemberActivityContributionWelfareUnlockingInfo(BaseModelMixin, BrandInfoMi |
||
| 792 | 792 |
|
| 793 | 793 |
@property |
| 794 | 794 |
def data(self): |
| 795 |
+ try: |
|
| 796 |
+ welfare = MemberActivityContributionWelfareInfo.objects.get(welfare_id=self.welfare_id) |
|
| 797 |
+ except MemberActivityContributionWelfareInfo.DoesNotExist: |
|
| 798 |
+ welfare = None |
|
| 795 | 799 |
return {
|
| 796 | 800 |
'unlocking_id': self.unlocking_id, |
| 797 | 801 |
'brand_id': self.brand_id, |
@@ -801,6 +805,7 @@ class MemberActivityContributionWelfareUnlockingInfo(BaseModelMixin, BrandInfoMi |
||
| 801 | 805 |
'activity_id': self.activity_id, |
| 802 | 806 |
'contribution_id': self.contribution_id, |
| 803 | 807 |
'welfare_id': self.welfare_id, |
| 808 |
+ 'welfare': welfare.data if welfare else {},
|
|
| 804 | 809 |
'name': self.name, |
| 805 | 810 |
'phone': self.phone, |
| 806 | 811 |
'address': self.address, |
@@ -100,6 +100,16 @@ class MemberActivityContributionStatusCode(BaseStatusCode): |
||
| 100 | 100 |
ACTIVITY_CONTRIBUTION_NOT_FOUND = StatusCodeField(503801, 'Activity Contribution Not Found', description=u'活动投稿不存在') |
| 101 | 101 |
|
| 102 | 102 |
|
| 103 |
+class MemberActivityContributionWelfareStatusCode(BaseStatusCode): |
|
| 104 |
+ """ 会员活动投稿福利相关错误码 5039xx """ |
|
| 105 |
+ ACTIVITY_CONTRIBUTION_WELFARE_NOT_FOUND = StatusCodeField(503901, 'Activity Contribution Welfare Not Found', description=u'活动投稿福利不存在') |
|
| 106 |
+ |
|
| 107 |
+ |
|
| 108 |
+class MemberActivityContributionWelfareUnblockingStatusCode(BaseStatusCode): |
|
| 109 |
+ """ 会员活动投稿福利相关错误码 5039xx """ |
|
| 110 |
+ ACTIVITY_CONTRIBUTION_WELFARE_UNBLOCKING_NOT_FOUND = StatusCodeField(503999, 'Activity Contribution Welfare Unblocking Not Found', description=u'活动投稿福利解锁不存在') |
|
| 111 |
+ |
|
| 112 |
+ |
|
| 103 | 113 |
class MemberCouponStatusCode(BaseStatusCode): |
| 104 | 114 |
""" 会员优惠券相关错误码 5040xx """ |
| 105 | 115 |
USER_COUPON_NOT_FOUND = StatusCodeField(504001, 'User Coupon Not Found', description=u'用户优惠券不存在') |