log = CouponInfo.objects.get(coupon_id=coupon_id, status=True)

     except CouponInfo.DoesNotExist:

@@ -1422,26 +1189,18 @@ def coupon_delete(request):

     return response(200, 'CouponInfo Delete Success', u'劵删除成功')

-def member_goods_list(request):

-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

-    admin_id = request.POST.get('admin_id', '')

+@check_admin

+def member_goods_list(request, administrator):

     title = request.POST.get('title', '')

     page = request.POST.get('page', 1)

     num = request.POST.get('num', 20)

-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:

-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)

-

-    try:

-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)

-    except AdministratorInfo.DoesNotExist:

-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)

-

     logs = GoodsInfo.objects.filter(title__icontains=title, only_for_member=False).order_by('-pk')

     count = logs.count()

     logs, left = pagination(logs, page, num)

     logs = [log.admindata for log in logs]

+

     return response(200, 'Get Member Goods Success', u'获取会员商品成功', data={

         'logs': logs,

         'left': left,

@@ -1449,19 +1208,10 @@ def member_goods_list(request):

     })

-def member_goods_details(request):

-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

-    admin_id = request.POST.get('admin_id', '')

+@check_admin

+def member_goods_detail(request, administrator):

     good_id = request.POST.get('good_id', '')

-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:

-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)

-

-    try:

-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)

-    except AdministratorInfo.DoesNotExist:

-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)

-

     try:

         log = GoodsInfo.objects.get(good_id=good_id)

     except GoodsInfo.DoesNotExist:

@@ -1474,9 +1224,8 @@ def member_goods_details(request):

     })

-def member_goods_update(request):

-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

-    admin_id = request.POST.get('admin_id', '')

+@check_admin

+def member_goods_update(request, administrator):

     good_id = request.POST.get('good_id', '')

     title = request.POST.get('title', '')

     desc = request.POST.get('desc', '')

@@ -1488,14 +1237,6 @@ def member_goods_update(request):

     integral = int(request.POST.get('integral', 0))

     fee = int(request.POST.get('fee', 0))

-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:

-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)

-

-    try:

-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)

-    except AdministratorInfo.DoesNotExist:

-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)

-

     try:

         log = GoodsInfo.objects.get(good_id=good_id, status=True)

     except GoodsInfo.DoesNotExist:

@@ -1515,9 +1256,8 @@ def member_goods_update(request):

     return response(200, 'GoodsInfo Update Success', u'积分商品更新成功')

-def member_goods_create(request):

-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

-    admin_id = request.POST.get('admin_id', '')

+@check_admin

+def member_goods_create(request, administrator):

     good_type = int(request.POST.get('good_type', 0))

     title = request.POST.get('title', '')

     desc = request.POST.get('desc', '')

@@ -1529,14 +1269,6 @@ def member_goods_create(request):

     integral = int(request.POST.get('integral', 0))

     fee = int(request.POST.get('fee', 0))

-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:

-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)

-

-    try:

-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)

-    except AdministratorInfo.DoesNotExist:

-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)

-

     GoodsInfo.objects.create(

         brand_id=administrator.brand_id,

         good_type=good_type,

@@ -1554,23 +1286,14 @@ def member_goods_create(request):

     return response(200, 'GoodsInfo Create Success', u'积分商品创建成功')

-def complement_code_list(request):

-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

-    admin_id = request.POST.get('admin_id', '')

-    page = request.POST.get('page', 1)

-    num = request.POST.get('num', 20)

+@check_admin

+def complement_code_list(request, administrator):

     start_time = request.POST.get('start_time', '')

     end_time = request.POST.get('end_time', '')

     type_ = request.POST.get('type', '')

     query = request.POST.get('query', '')

-

-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:

-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)

-

-    try:

-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)

-    except AdministratorInfo.DoesNotExist:

-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)

+    page = request.POST.get('page', 1)

+    num = request.POST.get('num', 20)

     logs = ComplementCodeLogInfo.objects.filter(status=True)

@@ -1602,21 +1325,14 @@ def complement_code_list(request):

     })

+@check_admin

 @transaction.atomic

-def complement_code_audit(request):

+def complement_code_audit(request, administrator):

     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

     admin_id = request.POST.get('admin_id', '')

     log_id = request.POST.get('log_id', '')

     audit_status = int(request.POST.get('audit_status', 0))  # -1 审核不通过, 1 审核通过

-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:

-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)

-

-    try:

-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)

-    except AdministratorInfo.DoesNotExist:

-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)

-

     if audit_status not in [ComplementCodeLogInfo.AUDIT_REFUSED, ComplementCodeLogInfo.AUDIT_PASS]:

         return response(ComplementCodeStatusCode.COMPLEMENT_CODE_STATUS_INVALID)

@@ -1699,21 +1415,12 @@ def complement_code_audit(request):

     return response()

+@check_admin

 @transaction.atomic

-def complement_code_contacted(request):

-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

-    admin_id = request.POST.get('admin_id', '')

+def complement_code_contacted(request, administrator):

     log_id = request.POST.get('log_id', '')

     is_contacted = int(request.POST.get('is_contacted', 0))  # 0 未联系, 1 已联系

-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:

-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)

-

-    try:

-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)

-    except AdministratorInfo.DoesNotExist:

-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)

-

     try:

         log = ComplementCodeLogInfo.objects.select_for_update().get(log_id=log_id, status=True)

     except ComplementCodeLogInfo.DoesNotExist:

@@ -1725,20 +1432,11 @@ def complement_code_contacted(request):

     return response()

-def administrator_list(request):

-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

-    admin_id = request.POST.get('admin_id', '')

+@check_admin

+def administrator_list(request, administrator):

     page = request.POST.get('page', 1)

     num = request.POST.get('num', 20)

-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:

-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)

-

-    try:

-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)

-    except AdministratorInfo.DoesNotExist:

-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)

-

     if administrator.admin_type != AdministratorInfo.ADMINISTRATOR:

         return response(AdministratorStatusCode.ADMINISTRATOR_PERMISSION_DENIED)

@@ -1747,6 +1445,7 @@ def administrator_list(request):

     count = logs.count()

     logs, left = pagination(logs, page, num)

     logs = [log.admindata for log in logs]

+

     return response(200, 'Get Admin List Success', u'获取后台管理员成功', data={

         'logs': logs,

         'left': left,

@@ -1754,31 +1453,21 @@ def administrator_list(request):

     })

-def administrator_create(request):

-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

-    admin_id = request.POST.get('admin_id', '')

-

+@check_admin

+def administrator_create(request, administrator):

     admin_type = request.POST.get('admin_type', '')

     phone = request.POST.get('phone', '')

     name = request.POST.get('name', '')

     password = request.POST.get('password', '')

     brand_name = request.POST.get('brand_name', '')

-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:

-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)

-

-    try:

-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)

-    except AdministratorInfo.DoesNotExist:

-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)

-

     if administrator.admin_type != AdministratorInfo.ADMINISTRATOR:

         return response(AdministratorStatusCode.ADMINISTRATOR_PERMISSION_DENIED)

     encryption = make_password(strip(password), settings.MAKE_PASSWORD_SALT, settings.MAKE_PASSWORD_HASHER)

     AdministratorInfo.objects.create(

-        brand_id=brand_id,

+        brand_id=administrator.brand_id,

         brand_name=brand_name,

         admin_type=admin_type,

         phone=phone,

@@ -1790,24 +1479,14 @@ def administrator_create(request):

     return response(200, 'Create Admin Success', u'创建后台管理员成功')

-def administrator_update(request):

-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

-    admin_id = request.POST.get('admin_id', '')

-

+@check_admin

+def administrator_update(request, administrator):

     target_admin_id = request.POST.get('target_admin_id', '')

     admin_type = int(request.POST.get('admin_type', -1))

     phone = request.POST.get('phone', '')

     name = request.POST.get('name', '')

     password = request.POST.get('password', '')

-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:

-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)

-

-    try:

-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)

-    except AdministratorInfo.DoesNotExist:

-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)

-

     if administrator.admin_type != AdministratorInfo.ADMINISTRATOR:

         return response(AdministratorStatusCode.ADMINISTRATOR_PERMISSION_DENIED)

@@ -1832,19 +1511,10 @@ def administrator_update(request):

     return response(200, 'Update Admin Success', u'更新后台管理员成功')

-def administrator_delete(request):

-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

-    admin_id = request.POST.get('admin_id', '')

+@check_admin

+def administrator_delete(request, administrator):

     target_admin_id = request.POST.get('target_admin_id', '')

-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:

-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)

-

-    try:

-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)

-    except AdministratorInfo.DoesNotExist:

-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)

-

     if administrator.admin_type != AdministratorInfo.ADMINISTRATOR:

         return response(AdministratorStatusCode.ADMINISTRATOR_PERMISSION_DENIED)

@@ -1853,21 +1523,12 @@ def administrator_delete(request):

     return response(200, 'Delete Admin Success', u'删除后台管理员成功')

-def administrator_login_list(request):

-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

-    admin_id = request.POST.get('admin_id', '')

+@check_admin

+def administrator_login_list(request, administrator):

     page = request.POST.get('page', 1)

     num = request.POST.get('num', 20)

     target_admin_id = request.POST.get('target_admin_id', '')

-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:

-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)

-

-    try:

-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)

-    except AdministratorInfo.DoesNotExist:

-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)

-

     if administrator.admin_type != AdministratorInfo.ADMINISTRATOR:

         return response(AdministratorStatusCode.ADMINISTRATOR_PERMISSION_DENIED)

@@ -165,7 +165,7 @@ urlpatterns += [

     url(r'^admin/member/goods/order/batch/update$', admin_views.member_goods_order_batch_update, name='member_goods_order_batch_update'),

     url(r'^admin/member/activity/list$', admin_views.member_activity_list, name='member_activity_list'),

-    url(r'^admin/member/activity/details$', admin_views.member_activity_details, name='member_activity_details'),

+    url(r'^admin/member/activity/details$', admin_views.member_activity_detail, name='member_activity_detail'),

     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'),

@@ -0,0 +1,39 @@

+# -*- coding: utf-8 -*-

+

+from __future__ import division

+

+from functools import wraps

+

+from django.conf import settings

+from django_response import response

+

+from mch.models import AdministratorInfo

+from utils.error.errno_utils import AdministratorStatusCode, ProductBrandStatusCode

+

+

+def check_admin(func=None):

+    def decorator(func):

+        @wraps(func)

+        def returned_wrapper(request, *args, **kwargs):

+            brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)

+            admin_id = request.POST.get('admin_id', '')

+

+            if brand_id != settings.KODO_DEFAULT_BRAND_ID:

+                return response(ProductBrandStatusCode.BRAND_NOT_MATCH)

+

+            try:

+                administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)

+            except AdministratorInfo.DoesNotExist:

+                return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)

+

+            return func(request, administrator=administrator, *args, **kwargs)

+

+        return returned_wrapper

+

+    if not func:

+        def foo(func):

+            return decorator(func)

+

+        return foo

+

+    return decorator(func)

@@ -5,9 +5,9 @@ from django.contrib import admin

 from django_admin import DeleteModelAdmin

 from account.models import UserInfo

-from member.models import (GoodsInfo, GoodsOrderInfo, MemberActivityContributionInfo, MemberActivityGroupShareInfo,

-                           MemberActivityInfo, MemberActivitySigninInfo, MemberActivitySignupInfo, RightInfo,

-                           ShotTypeInfo)

+from member.models import (GoodsInfo, GoodsOrderInfo, MemberActivityContributionInfo,

+                           MemberActivityContributionWelfareInfo, MemberActivityGroupShareInfo, MemberActivityInfo,

+                           MemberActivitySigninInfo, MemberActivitySignupInfo, RightInfo, ShotTypeInfo)

 from pre.custom_message import sendwxasubscribemessage

 from utils.redis.rshot import update_member_shot_data

@@ -103,6 +103,11 @@ class MemberActivityContributionInfoAdmin(admin.ModelAdmin):

     list_filter = ('activity_id', 'content_type', 'is_audit_pass', 'is_selected', 'status')

+class MemberActivityContributionWelfareInfoAdmin(admin.ModelAdmin):

+    list_display = ('welfare_id', 'welfare_type', 'welfare_title', 'welfare_detail', 'welfare_value', 'welfare_image', 'status', 'created_at', 'updated_at')

+    list_filter = ('welfare_type', 'status')

+

+

 admin.site.register(GoodsInfo, GoodsInfoAdmin)

 admin.site.register(GoodsOrderInfo, GoodsOrderInfoAdmin)

 admin.site.register(RightInfo, RightInfoAdmin)

@@ -112,3 +117,4 @@ admin.site.register(MemberActivitySignupInfo, MemberActivitySignupInfoAdmin)

 admin.site.register(MemberActivitySigninInfo, MemberActivitySigninInfoAdmin)

 admin.site.register(MemberActivityGroupShareInfo, MemberActivityGroupShareInfoAdmin)

 admin.site.register(MemberActivityContributionInfo, MemberActivityContributionInfoAdmin)

+admin.site.register(MemberActivityContributionWelfareInfo, MemberActivityContributionWelfareInfoAdmin)

@@ -0,0 +1,43 @@

+# -*- coding: utf-8 -*-

+# Generated by Django 3.2.16 on 2022-10-24 17:41

+

+from django.db import migrations, models

+import django_models_ext.fileext

+import shortuuidfield.fields

+import simditor.fields

+

+

+class Migration(migrations.Migration):

+

+    dependencies = [

+        ('member', '0037_auto_20221023_2010'),

+    ]

+

+    operations = [

+        migrations.CreateModel(

+            name='MemberActivityContributionWelfareInfo',

+            fields=[

+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),

+                ('status', models.BooleanField(default=True, help_text='Status', verbose_name='status')),

+                ('created_at', models.DateTimeField(auto_now_add=True, help_text='Create Time', verbose_name='created_at')),

+                ('updated_at', models.DateTimeField(auto_now=True, help_text='Update Time', verbose_name='updated_at')),

+                ('brand_id', models.CharField(blank=True, db_index=True, help_text='品牌唯一标识', max_length=32, null=True, verbose_name='brand_id')),

+                ('brand_name', models.CharField(blank=True, help_text='品牌名称', max_length=255, null=True, verbose_name='brand_name')),

+                ('welfare_id', shortuuidfield.fields.ShortUUIDField(blank=True, db_index=True, editable=False, help_text='福利唯一标识', max_length=22, null=True, unique=True)),

+                ('welfare_type', models.IntegerField(choices=[(0, '实物'), (1, '积分'), (2, '虚拟')], db_index=True, default=0, help_text='福利类型', verbose_name='welfare_type')),

+                ('welfare_title', models.CharField(blank=True, help_text='福利标题', max_length=255, null=True, verbose_name='welfare_title')),

+                ('welfare_detail', simditor.fields.RichTextField(blank=True, help_text='福利详情', null=True, verbose_name='welfare_detail')),

+                ('welfare_value', models.IntegerField(default=0, help_text='福利数量', verbose_name='welfare_value')),

+                ('welfare_image', models.ImageField(blank=True, help_text='福利图片', null=True, upload_to=django_models_ext.fileext.upload_path, verbose_name='welfare_image')),

+            ],

+            options={

+                'verbose_name': '会员活动投稿福利信息',

+                'verbose_name_plural': '会员活动投稿福利信息',

+            },

+        ),

+        migrations.AlterField(

+            model_name='memberactivitycontributioninfo',

+            name='content_type',

+            field=models.IntegerField(choices=[(0, '投稿'), (1, '创作日记')], db_index=True, default=0, help_text='内容类型', verbose_name='content_type'),

+        ),

+    ]

@@ -0,0 +1,19 @@

+# -*- coding: utf-8 -*-

+# Generated by Django 3.2.16 on 2022-10-24 17:59

+

+from django.db import migrations, models

+

+

+class Migration(migrations.Migration):

+

+    dependencies = [

+        ('member', '0038_auto_20221025_0141'),

+    ]

+

+    operations = [

+        migrations.AddField(

+            model_name='memberactivitycontributionwelfareinfo',

+            name='is_upload_qiniu',

+            field=models.BooleanField(default=False, help_text='是否已上传七牛', verbose_name='is_upload_qiniu'),

+        ),

+    ]

@@ -718,3 +718,53 @@ class MemberActivityContributionInfo(BaseModelMixin):

             'video_url': self.video_url or '',

             'created_at': tc.local_string(utc_dt=self.created_at),

         }

+

+

+class MemberActivityContributionWelfareInfo(BaseModelMixin):

+    WELFARE_TYPE = (

+        (0, u'实物'),

+        (1, u'积分'),

+        (2, u'虚拟'),

+    )

+

+    brand_id = models.CharField(_(u'brand_id'), max_length=32, blank=True, null=True, help_text=u'品牌唯一标识', db_index=True)

+    brand_name = models.CharField(_(u'brand_name'), max_length=255, blank=True, null=True, help_text=u'品牌名称')

+

+    welfare_id = ShortUUIDField(_(u'welfare_id'), max_length=32, blank=True, null=True, help_text=u'福利唯一标识', db_index=True, unique=True)

+

+    welfare_type = models.IntegerField(_(u'welfare_type'), choices=WELFARE_TYPE, default=0, help_text=u'福利类型', db_index=True)

+

+    welfare_title = models.CharField(_(u'welfare_title'), max_length=255, blank=True, null=True, help_text=u'福利标题')

+    welfare_detail = RichTextField(_(u'welfare_detail'), blank=True, null=True, help_text=u'福利详情')

+    welfare_value = models.IntegerField(_(u'welfare_value'), default=0, help_text=_(u'福利数量'))

+    welfare_image = models.ImageField(_(u'welfare_image'), upload_to=upload_path, blank=True, null=True, help_text=u'福利图片')

+

+    is_upload_qiniu = models.BooleanField(_(u'is_upload_qiniu'), default=False, help_text=_(u'是否已上传七牛'))

+

+    class Meta:

+        verbose_name = _(u'会员活动投稿福利信息')

+        verbose_name_plural = _(u'会员活动投稿福利信息')

+

+    def __unicode__(self):

+        return '%d' % self.pk

+

+    @property

+    def welfare_image_path(self):

+        return upload_file_path(self.welfare_image)

+

+    @property

+    def welfare_image_url(self):

+        return qiniu_file_url(self.welfare_image.name, bucket='tamron') if self.is_upload_qiniu else upload_file_url(self.welfare_image)

+

+    @property

+    def data(self):

+        return {

+            'welfare_id': self.welfare_id,

+            'welfare_type': self.welfare_type,

+            'welfare_type_str': dict(MemberActivityContributionWelfareInfo.WELFARE_TYPE).get(self.welfare_type),

+            'welfare_title': self.welfare_title,

+            'welfare_detail': self.welfare_detail,

+            'welfare_value': self.welfare_value,

+            'welfare_image_url': self.welfare_image_url,

+            'welfare_image_path': self.welfare_image_path,

+        }

Strona główna Odkrywaj Pomoc

Zarejestruj się Zaloguj się

Kodo

/

kodo

Obserwuj 2

Polub 0

Fork 0

Problemy 0 Pull Requests 0 Commity 1813 Wydania 0

1 Commity (c7602bfce9541c4c980046976595ff390b88bc1e)

Autor	SHA1	Wiadomość	Data
Brightcells	e04f95dc5e	long => lon	8 lat temu