@@ -106,6 +106,7 @@ def activity_update(request, administrator):  | 
            ||
| 106 | 106 | 
                     is_series = request.POST.get('is_series', False)
               | 
            
| 107 | 107 | 
                     main_activity_id = request.POST.get('main_activity_id', '')
               | 
            
| 108 | 108 | 
                     limit_contribute_num = request.POST.get('limit_contribute_num', 1)
               | 
            
| 109 | 
                +    feed_id = request.POST.get('feed_id', '')
               | 
            |
| 109 | 110 | 
                 | 
            
| 110 | 111 | 
                try:  | 
            
| 111 | 112 | 
                log = MemberActivityInfo.objects.get(activity_id=activity_id, status=True)  | 
            
                @@ -142,6 +143,7 @@ def activity_update(request, administrator):  | 
            ||
| 142 | 143 | 
                log.is_series = is_series  | 
            
| 143 | 144 | 
                log.main_activity_id = main_activity_id  | 
            
| 144 | 145 | 
                log.limit_contribute_num = limit_contribute_num  | 
            
| 146 | 
                + log.feed_id = feed_id  | 
            |
| 145 | 147 | 
                log.save()  | 
            
| 146 | 148 | 
                 | 
            
| 147 | 149 | 
                return response(200, 'MemberActivityInfo Update Success', u'会员活动更新成功')  | 
            
                @@ -178,6 +180,7 @@ def activity_create(request, administrator):  | 
            ||
| 178 | 180 | 
                     is_series = request.POST.get('is_series', False)
               | 
            
| 179 | 181 | 
                     main_activity_id = request.POST.get('main_activity_id', '')
               | 
            
| 180 | 182 | 
                     limit_contribute_num = request.POST.get('limit_contribute_num', 1)
               | 
            
| 183 | 
                +    feed_id = request.POST.get('feed_id', '')
               | 
            |
| 181 | 184 | 
                 | 
            
| 182 | 185 | 
                act = MemberActivityInfo.objects.create(  | 
            
| 183 | 186 | 
                brand_id=administrator.brand_id,  | 
            
                @@ -212,6 +215,7 @@ def activity_create(request, administrator):  | 
            ||
| 212 | 215 | 
                is_series=is_series,  | 
            
| 213 | 216 | 
                main_activity_id=main_activity_id,  | 
            
| 214 | 217 | 
                limit_contribute_num=limit_contribute_num,  | 
            
| 218 | 
                + feed_id=feed_id,  | 
            |
| 215 | 219 | 
                )  | 
            
| 216 | 220 | 
                 | 
            
| 217 | 221 | 
                     return response(200, 'MemberActivityInfo Create Success', u'会员活动创建成功', data={
               | 
            
                @@ -0,0 +1,20 @@  | 
            ||
| 1 | 
                +# -*- coding: utf-8 -*-  | 
            |
| 2 | 
                +  | 
            |
| 3 | 
                +# Generated by Django 3.2.6 on 2023-05-06 10:24  | 
            |
| 4 | 
                +  | 
            |
| 5 | 
                +from django.db import migrations, models  | 
            |
| 6 | 
                +  | 
            |
| 7 | 
                +  | 
            |
| 8 | 
                +class Migration(migrations.Migration):  | 
            |
| 9 | 
                +  | 
            |
| 10 | 
                + dependencies = [  | 
            |
| 11 | 
                +        ('member', '0058_auto_20230506_1650'),
               | 
            |
| 12 | 
                + ]  | 
            |
| 13 | 
                +  | 
            |
| 14 | 
                + operations = [  | 
            |
| 15 | 
                + migrations.AddField(  | 
            |
| 16 | 
                + model_name='memberactivityinfo',  | 
            |
| 17 | 
                + name='feed_id',  | 
            |
| 18 | 
                + field=models.CharField(blank=True, default='', help_text='直播回放唯一标识', max_length=32, verbose_name='feed_id'),  | 
            |
| 19 | 
                + ),  | 
            |
| 20 | 
                + ]  | 
            
                @@ -436,6 +436,8 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin):  | 
            ||
| 436 | 436 | 
                 | 
            
| 437 | 437 | 
                limit_contribute_num = models.IntegerField(_(u'limit_contribute_num'), default=1, help_text=u'限制投稿次数')  | 
            
| 438 | 438 | 
                 | 
            
| 439 | 
                + feed_id = models.CharField(_(u'feed_id'), max_length=32, blank=True, default='', help_text=u'直播回放唯一标识')  | 
            |
| 440 | 
                +  | 
            |
| 439 | 441 | 
                class Meta:  | 
            
| 440 | 442 | 
                verbose_name = _(u'会员活动信息')  | 
            
| 441 | 443 | 
                verbose_name_plural = _(u'会员活动信息')  | 
            
                @@ -558,6 +560,7 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin):  | 
            ||
| 558 | 560 | 
                'main_activity_id': self.main_activity_id,  | 
            
| 559 | 561 | 
                'limit_contribute_num': self.limit_contribute_num,  | 
            
| 560 | 562 | 
                'is_series': self.is_series,  | 
            
| 563 | 
                + 'feed_id': self.feed_id,  | 
            |
| 561 | 564 | 
                }  | 
            
| 562 | 565 | 
                 | 
            
| 563 | 566 | 
                def details(self, user_id):  | 
            
                @@ -601,6 +604,7 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin):  | 
            ||
| 601 | 604 | 
                'main_activity_id': self.main_activity_id,  | 
            
| 602 | 605 | 
                'limit_contribute_num': self.limit_contribute_num,  | 
            
| 603 | 606 | 
                'is_series': self.is_series,  | 
            
| 607 | 
                + 'feed_id': self.feed_id,  | 
            |
| 604 | 608 | 
                }  | 
            
| 605 | 609 | 
                 | 
            
| 606 | 610 | 
                @property  | 
            
                @@ -646,6 +650,7 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin):  | 
            ||
| 646 | 650 | 
                'main_activity_id': self.main_activity_id,  | 
            
| 647 | 651 | 
                'limit_contribute_num': self.limit_contribute_num,  | 
            
| 648 | 652 | 
                'is_series': self.is_series,  | 
            
| 653 | 
                + 'feed_id': self.feed_id,  | 
            |
| 649 | 654 | 
                }  | 
            
| 650 | 655 | 
                 | 
            
| 651 | 656 | 
                @property  | 
            
                @@ -696,6 +701,7 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin):  | 
            ||
| 696 | 701 | 
                'main_activity_id': self.main_activity_id,  | 
            
| 697 | 702 | 
                'limit_contribute_num': self.limit_contribute_num,  | 
            
| 698 | 703 | 
                'is_series': self.is_series,  | 
            
| 704 | 
                + 'feed_id': self.feed_id,  | 
            |
| 699 | 705 | 
                }  | 
            
| 700 | 706 | 
                 | 
            
| 701 | 707 | 
                 |