瀏覽代碼

添加活动链接字段,更改返回数据类型

linhaohong 1 年之前
父節點
當前提交
05201ee464
共有 1 個文件被更改,包括 9 次插入3 次删除
  1. 9 3
      Controller/AppCampaignController.py

+ 9 - 3
Controller/AppCampaignController.py

@@ -86,14 +86,15 @@ class AppCampaignView(View):
                 'id': campaign.id,
                 'image_url': 'https://ansjerfilemanager.s3.amazonaws.com/app/campaign/' + campaign.image_url,
                 'campaign_name': campaign.campaign_name,
+                'campaign_url': campaign.campaign_url,
                 'campaign_type': campaign.campaign_type,
                 'status': campaign.status,
                 'campaign_start_date': campaign.campaign_start_date,
                 'campaign_end_date': campaign.campaign_end_date,
                 'campaign_show_stime': campaign.campaign_show_stime,
                 'campaign_show_etime': campaign.campaign_show_etime,
-                'countries': [country.country_name for country in campaign.country_list],
-                'device_types': [device.name for device in campaign.device_type_list],
+                'countries': str([country.country_name for country in campaign.country_list]),
+                'device_types': str([device.name for device in campaign.device_type_list]),
             }
             campaign_list.append(campaign_data)
 
@@ -113,6 +114,7 @@ class AppCampaignView(View):
         """
         file = request.FILES.get('posterFile', None)
         campaign_name = request_dict.get('campaign_name', None)
+        campaign_url = request_dict.get('campaign_url', None)
         campaign_type = request_dict.get('campaign_type', None)
         device_type_names = json.loads(request_dict.get('device_type_list', None))  # 设备类型名称列表
         country_name_list = json.loads(request_dict.get('country_name_list', None))  # 地区列表
@@ -121,7 +123,7 @@ class AppCampaignView(View):
         campaign_show_stime = request_dict.get('campaign_show_stime', 0)
         campaign_show_etime = request_dict.get('campaign_show_etime', 86400)
 
-        if not all([campaign_name, campaign_type, device_type_names,
+        if not all([campaign_name, campaign_type, device_type_names, campaign_url,
                     country_name_list, campaign_start_time, campaign_end_time, file]):
             return response.json(444)
 
@@ -142,6 +144,7 @@ class AppCampaignView(View):
             new_campaign = AppAdvertiseCampaign.objects.create(
                 image_url="OpenScreenAdvertise/" + fileName,
                 campaign_name=campaign_name,
+                campaign_url=campaign_url,
                 campaign_type=campaign_type,
                 status=1,
                 campaign_start_date=campaign_start_time,
@@ -171,6 +174,7 @@ class AppCampaignView(View):
         campaign_id = request_dict.get('id', None)
         file = request.FILES.get('posterFile', None)
         campaign_name = request_dict.get('campaign_name', None)
+        campaign_url = request_dict.get('campaign_url', None)
         campaign_type = request_dict.get('campaign_type', None)
         device_type_names = json.loads(request_dict.get('device_type_list', None))  # 设备类型名称列表
         country_name_list = json.loads(request_dict.get('country_name_list', None))  # 地区列表
@@ -200,6 +204,8 @@ class AppCampaignView(View):
                 campaign.image_url = "OpenScreenAdvertise/" + file.name
             if campaign_name is not None:
                 campaign.campaign_name = campaign_name
+            if campaign_url is not None:
+                campaign.campaign_url = campaign_url
             if campaign_type is not None:
                 campaign.campaign_type = campaign_type
             if campaign_start_time is not None: