增加产品名

AdminController/EvaluationActivityController.py

@@ -61,7 +61,8 @@ class EvaluationActivityView(View):
             now_time = int(time.time())
             activity_qs = FreeEvaluationActivity.objects.filter(is_show=1).values('activity_name', 'carousel_image_url',
                                                                                   'details_image_url', 'issue', 'id',
-                                                                                  'product_number', 'original_price')
+                                                                                  'product_number', 'original_price',
+                                                                                  'product_name')
             if activity_qs.exists():
                 activity = activity_qs[0]
                 time_qs = ActivityTime.objects.filter(activity_id=activity['id']).values('node_content', 'start_time',
@@ -139,11 +140,12 @@ class EvaluationActivityView(View):
         details_image = request.FILES.get('details_image', None)
         issue = request_dict.get('issue', None)
         product_number = request_dict.get('product_number', None)
+        product_name = request_dict.get('product_name', None)
         original_price = request_dict.get('original_price', None)
         activity_process = request_dict.get('activity_process', None)
         is_show = request_dict.get('is_show', None)
 
-        if not all([activity_name, issue, product_number, original_price, is_show, activity_process]):
+        if not all([activity_name, issue, product_number, original_price, is_show, activity_process, product_name]):
             return response.json(404)
         now_time = int(time.time())
         activity_process = eval(activity_process)
@@ -175,7 +177,7 @@ class EvaluationActivityView(View):
                     FreeEvaluationActivity.objects.filter(id=activity_id).update(details_image_url=details_image_url)
             with transaction.atomic():
                 if activity_id:  # 编辑活动
-                    FreeEvaluationActivity.objects.filter(id=activity_id).update(issue=issue,
+                    FreeEvaluationActivity.objects.filter(id=activity_id).update(issue=issue, product_name=product_name,
                                                                                  product_number=product_number,
                                                                                  original_price=original_price,
                                                                                  is_show=is_show, update_time=now_time)
@@ -187,10 +189,10 @@ class EvaluationActivityView(View):
                 else:  # 增加活动
                     if not all([carousel_image, details_image]):
                         return response.json(404)
-                    activity_qs = FreeEvaluationActivity.objects.create(activity_name=activity_name,
+                    activity_qs = FreeEvaluationActivity.objects.create(activity_name=activity_name, issue=issue,
                                                                         product_number=product_number,
                                                                         carousel_image_url=carousel_image_url,
-                                                                        is_show=is_show, issue=issue,
+                                                                        is_show=is_show, product_name=product_name,
                                                                         original_price=original_price,
                                                                         details_image_url=details_image_url,
                                                                         created_time=now_time, update_time=now_time)
@@ -214,7 +216,7 @@ class EvaluationActivityView(View):
             activity_qs = FreeEvaluationActivity.objects.all()
             count = activity_qs.count()
             activity_qs = activity_qs.values('id', 'activity_name', 'carousel_image_url', 'details_image_url', 'issue',
-                                             'is_show', 'product_number', 'original_price')[
+                                             'is_show', 'product_number', 'original_price', 'product_name')[
                           (page - 1) * line: page * line]
             for item in activity_qs:
                 time_qs = ActivityTime.objects.filter(activity_id=item['id']).values('node_content', 'start_time',

Model/models.py

@@ -5154,6 +5154,7 @@ class DeviceApplePackage(models.Model):
 class FreeEvaluationActivity(models.Model):
     id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
     activity_name = models.CharField(default='', max_length=64, verbose_name='活动名称')
+    product_name = models.CharField(default='', max_length=20, verbose_name='产品名')
     carousel_image_url = models.TextField(default='', verbose_name='轮播图地址')
     details_image_url = models.TextField(default='', verbose_name='详情图地址')
     issue = models.SmallIntegerField(default=0, verbose_name='活动期数')