url(r'^admin/member/activity/update$', admin_views.member_activity_update, name='member_activity_update'),
url(r'^admin/member/activity/create$', admin_views.member_activity_create, name='member_activity_create'),
url(r'^admin/member/activity/share/list$', admin_views.member_activity_share_list, name='member_activity_share_list'),
@@ -175,14 +175,19 @@ urlpatterns += [
url(r'^admin/member/activity/contribute/audit$', admin_views.member_activity_contribute_audit, name='admin_member_activity_contribute_audit'),
url(r'^admin/member/activity/contribute/selected$', admin_views.member_activity_contribute_selected, name='admin_member_activity_contribute_selected'),
+ url(r'^admin/member/activity/contribute/welfare/list$', admin_views.member_activity_contribute_welfare_list, name='member_activity_contribute_welfare_list'),
+ url(r'^admin/member/activity/contribute/welfare/detail$', admin_views.member_activity_contribute_welfare_detail, name='member_activity_contribute_welfare_detail'),
+ url(r'^admin/member/activity/contribute/welfare/update$', admin_views.member_activity_contribute_welfare_update, name='member_activity_contribute_welfare_update'),
+ url(r'^admin/member/activity/contribute/welfare/create$', admin_views.member_activity_contribute_welfare_create, name='member_activity_contribute_welfare_create'),
+
url(r'^admin/coupon/list$', admin_views.coupon_list, name='coupon_list'),
- url(r'^admin/coupon/details$', admin_views.coupon_details, name='coupon_update'),
+ url(r'^admin/coupon/details$', admin_views.coupon_detail, name='coupon_detail'),
url(r'^admin/coupon/create$', admin_views.coupon_create, name='coupon_create'),
url(r'^admin/coupon/update$', admin_views.coupon_update, name='coupon_update'),
url(r'^admin/coupon/delete$', admin_views.coupon_delete, name='coupon_delete'),
url(r'^admin/member/goods/list$', admin_views.member_goods_list, name='member_goods_list'),
- url(r'^admin/member/goods/details$', admin_views.member_goods_details, name='member_goods_details'),
+ url(r'^admin/member/goods/details$', admin_views.member_goods_detail, name='member_goods_detail'),
url(r'^admin/member/goods/create$', admin_views.member_goods_create, name='member_goods_create'),
url(r'^admin/member/goods/update$', admin_views.member_goods_update, name='member_goods_update'),
@@ -5,9 +5,9 @@ from django.contrib import admin |
||
| 5 | 5 |
from django_admin import DeleteModelAdmin |
| 6 | 6 |
|
| 7 | 7 |
from account.models import UserInfo |
| 8 |
-from member.models import (GoodsInfo, GoodsOrderInfo, MemberActivityContributionInfo, MemberActivityGroupShareInfo, |
|
| 9 |
- MemberActivityInfo, MemberActivitySigninInfo, MemberActivitySignupInfo, RightInfo, |
|
| 10 |
- ShotTypeInfo) |
|
| 8 |
+from member.models import (GoodsInfo, GoodsOrderInfo, MemberActivityContributionInfo, |
|
| 9 |
+ MemberActivityContributionWelfareInfo, MemberActivityGroupShareInfo, MemberActivityInfo, |
|
| 10 |
+ MemberActivitySigninInfo, MemberActivitySignupInfo, RightInfo, ShotTypeInfo) |
|
| 11 | 11 |
from pre.custom_message import sendwxasubscribemessage |
| 12 | 12 |
from utils.redis.rshot import update_member_shot_data |
| 13 | 13 |
|
@@ -103,6 +103,11 @@ class MemberActivityContributionInfoAdmin(admin.ModelAdmin): |
||
| 103 | 103 |
list_filter = ('activity_id', 'content_type', 'is_audit_pass', 'is_selected', 'status')
|
| 104 | 104 |
|
| 105 | 105 |
|
| 106 |
+class MemberActivityContributionWelfareInfoAdmin(admin.ModelAdmin): |
|
| 107 |
+ list_display = ('welfare_id', 'welfare_type', 'welfare_title', 'welfare_detail', 'welfare_value', 'welfare_image', 'status', 'created_at', 'updated_at')
|
|
| 108 |
+ list_filter = ('welfare_type', 'status')
|
|
| 109 |
+ |
|
| 110 |
+ |
|
| 106 | 111 |
admin.site.register(GoodsInfo, GoodsInfoAdmin) |
| 107 | 112 |
admin.site.register(GoodsOrderInfo, GoodsOrderInfoAdmin) |
| 108 | 113 |
admin.site.register(RightInfo, RightInfoAdmin) |
@@ -112,3 +117,4 @@ admin.site.register(MemberActivitySignupInfo, MemberActivitySignupInfoAdmin) |
||
| 112 | 117 |
admin.site.register(MemberActivitySigninInfo, MemberActivitySigninInfoAdmin) |
| 113 | 118 |
admin.site.register(MemberActivityGroupShareInfo, MemberActivityGroupShareInfoAdmin) |
| 114 | 119 |
admin.site.register(MemberActivityContributionInfo, MemberActivityContributionInfoAdmin) |
| 120 |
+admin.site.register(MemberActivityContributionWelfareInfo, MemberActivityContributionWelfareInfoAdmin) |
@@ -0,0 +1,43 @@ |
||
| 1 |
+# -*- coding: utf-8 -*- |
|
| 2 |
+# Generated by Django 3.2.16 on 2022-10-24 17:41 |
|
| 3 |
+ |
|
| 4 |
+from django.db import migrations, models |
|
| 5 |
+import django_models_ext.fileext |
|
| 6 |
+import shortuuidfield.fields |
|
| 7 |
+import simditor.fields |
|
| 8 |
+ |
|
| 9 |
+ |
|
| 10 |
+class Migration(migrations.Migration): |
|
| 11 |
+ |
|
| 12 |
+ dependencies = [ |
|
| 13 |
+ ('member', '0037_auto_20221023_2010'),
|
|
| 14 |
+ ] |
|
| 15 |
+ |
|
| 16 |
+ operations = [ |
|
| 17 |
+ migrations.CreateModel( |
|
| 18 |
+ name='MemberActivityContributionWelfareInfo', |
|
| 19 |
+ fields=[ |
|
| 20 |
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
| 21 |
+ ('status', models.BooleanField(default=True, help_text='Status', verbose_name='status')),
|
|
| 22 |
+ ('created_at', models.DateTimeField(auto_now_add=True, help_text='Create Time', verbose_name='created_at')),
|
|
| 23 |
+ ('updated_at', models.DateTimeField(auto_now=True, help_text='Update Time', verbose_name='updated_at')),
|
|
| 24 |
+ ('brand_id', models.CharField(blank=True, db_index=True, help_text='品牌唯一标识', max_length=32, null=True, verbose_name='brand_id')),
|
|
| 25 |
+ ('brand_name', models.CharField(blank=True, help_text='品牌名称', max_length=255, null=True, verbose_name='brand_name')),
|
|
| 26 |
+ ('welfare_id', shortuuidfield.fields.ShortUUIDField(blank=True, db_index=True, editable=False, help_text='福利唯一标识', max_length=22, null=True, unique=True)),
|
|
| 27 |
+ ('welfare_type', models.IntegerField(choices=[(0, '实物'), (1, '积分'), (2, '虚拟')], db_index=True, default=0, help_text='福利类型', verbose_name='welfare_type')),
|
|
| 28 |
+ ('welfare_title', models.CharField(blank=True, help_text='福利标题', max_length=255, null=True, verbose_name='welfare_title')),
|
|
| 29 |
+ ('welfare_detail', simditor.fields.RichTextField(blank=True, help_text='福利详情', null=True, verbose_name='welfare_detail')),
|
|
| 30 |
+ ('welfare_value', models.IntegerField(default=0, help_text='福利数量', verbose_name='welfare_value')),
|
|
| 31 |
+ ('welfare_image', models.ImageField(blank=True, help_text='福利图片', null=True, upload_to=django_models_ext.fileext.upload_path, verbose_name='welfare_image')),
|
|
| 32 |
+ ], |
|
| 33 |
+ options={
|
|
| 34 |
+ 'verbose_name': '会员活动投稿福利信息', |
|
| 35 |
+ 'verbose_name_plural': '会员活动投稿福利信息', |
|
| 36 |
+ }, |
|
| 37 |
+ ), |
|
| 38 |
+ migrations.AlterField( |
|
| 39 |
+ model_name='memberactivitycontributioninfo', |
|
| 40 |
+ name='content_type', |
|
| 41 |
+ field=models.IntegerField(choices=[(0, '投稿'), (1, '创作日记')], db_index=True, default=0, help_text='内容类型', verbose_name='content_type'), |
|
| 42 |
+ ), |
|
| 43 |
+ ] |
@@ -0,0 +1,19 @@ |
||
| 1 |
+# -*- coding: utf-8 -*- |
|
| 2 |
+# Generated by Django 3.2.16 on 2022-10-24 17:59 |
|
| 3 |
+ |
|
| 4 |
+from django.db import migrations, models |
|
| 5 |
+ |
|
| 6 |
+ |
|
| 7 |
+class Migration(migrations.Migration): |
|
| 8 |
+ |
|
| 9 |
+ dependencies = [ |
|
| 10 |
+ ('member', '0038_auto_20221025_0141'),
|
|
| 11 |
+ ] |
|
| 12 |
+ |
|
| 13 |
+ operations = [ |
|
| 14 |
+ migrations.AddField( |
|
| 15 |
+ model_name='memberactivitycontributionwelfareinfo', |
|
| 16 |
+ name='is_upload_qiniu', |
|
| 17 |
+ field=models.BooleanField(default=False, help_text='是否已上传七牛', verbose_name='is_upload_qiniu'), |
|
| 18 |
+ ), |
|
| 19 |
+ ] |
@@ -718,3 +718,53 @@ class MemberActivityContributionInfo(BaseModelMixin): |
||
| 718 | 718 |
'video_url': self.video_url or '', |
| 719 | 719 |
'created_at': tc.local_string(utc_dt=self.created_at), |
| 720 | 720 |
} |
| 721 |
+ |
|
| 722 |
+ |
|
| 723 |
+class MemberActivityContributionWelfareInfo(BaseModelMixin): |
|
| 724 |
+ WELFARE_TYPE = ( |
|
| 725 |
+ (0, u'实物'), |
|
| 726 |
+ (1, u'积分'), |
|
| 727 |
+ (2, u'虚拟'), |
|
| 728 |
+ ) |
|
| 729 |
+ |
|
| 730 |
+ brand_id = models.CharField(_(u'brand_id'), max_length=32, blank=True, null=True, help_text=u'品牌唯一标识', db_index=True) |
|
| 731 |
+ brand_name = models.CharField(_(u'brand_name'), max_length=255, blank=True, null=True, help_text=u'品牌名称') |
|
| 732 |
+ |
|
| 733 |
+ welfare_id = ShortUUIDField(_(u'welfare_id'), max_length=32, blank=True, null=True, help_text=u'福利唯一标识', db_index=True, unique=True) |
|
| 734 |
+ |
|
| 735 |
+ welfare_type = models.IntegerField(_(u'welfare_type'), choices=WELFARE_TYPE, default=0, help_text=u'福利类型', db_index=True) |
|
| 736 |
+ |
|
| 737 |
+ welfare_title = models.CharField(_(u'welfare_title'), max_length=255, blank=True, null=True, help_text=u'福利标题') |
|
| 738 |
+ welfare_detail = RichTextField(_(u'welfare_detail'), blank=True, null=True, help_text=u'福利详情') |
|
| 739 |
+ welfare_value = models.IntegerField(_(u'welfare_value'), default=0, help_text=_(u'福利数量')) |
|
| 740 |
+ welfare_image = models.ImageField(_(u'welfare_image'), upload_to=upload_path, blank=True, null=True, help_text=u'福利图片') |
|
| 741 |
+ |
|
| 742 |
+ is_upload_qiniu = models.BooleanField(_(u'is_upload_qiniu'), default=False, help_text=_(u'是否已上传七牛')) |
|
| 743 |
+ |
|
| 744 |
+ class Meta: |
|
| 745 |
+ verbose_name = _(u'会员活动投稿福利信息') |
|
| 746 |
+ verbose_name_plural = _(u'会员活动投稿福利信息') |
|
| 747 |
+ |
|
| 748 |
+ def __unicode__(self): |
|
| 749 |
+ return '%d' % self.pk |
|
| 750 |
+ |
|
| 751 |
+ @property |
|
| 752 |
+ def welfare_image_path(self): |
|
| 753 |
+ return upload_file_path(self.welfare_image) |
|
| 754 |
+ |
|
| 755 |
+ @property |
|
| 756 |
+ def welfare_image_url(self): |
|
| 757 |
+ return qiniu_file_url(self.welfare_image.name, bucket='tamron') if self.is_upload_qiniu else upload_file_url(self.welfare_image) |
|
| 758 |
+ |
|
| 759 |
+ @property |
|
| 760 |
+ def data(self): |
|
| 761 |
+ return {
|
|
| 762 |
+ 'welfare_id': self.welfare_id, |
|
| 763 |
+ 'welfare_type': self.welfare_type, |
|
| 764 |
+ 'welfare_type_str': dict(MemberActivityContributionWelfareInfo.WELFARE_TYPE).get(self.welfare_type), |
|
| 765 |
+ 'welfare_title': self.welfare_title, |
|
| 766 |
+ 'welfare_detail': self.welfare_detail, |
|
| 767 |
+ 'welfare_value': self.welfare_value, |
|
| 768 |
+ 'welfare_image_url': self.welfare_image_url, |
|
| 769 |
+ 'welfare_image_path': self.welfare_image_path, |
|
| 770 |
+ } |