|
@@ -383,6 +383,7 @@ class AppCampaignView(View):
|
|
|
)
|
|
|
if not open_screen_campaign_qs.exists():
|
|
|
OpenScreenCampaign.objects.create(user_id=user_id,
|
|
|
+ update_time=int(time.time()),
|
|
|
create_time=int(time.time()))
|
|
|
try:
|
|
|
country_prefetch = Prefetch('country', queryset=CountryModel.objects.only('id'), to_attr='country_list')
|
|
@@ -510,22 +511,25 @@ class AppCampaignView(View):
|
|
|
end_time = request_dict.get('end_time', None)
|
|
|
if not all([start_time, end_time]):
|
|
|
return response.json(444)
|
|
|
- open_screen_campaign_qs = OpenScreenCampaign.objects.filter(update_time__range=[int(start_time), int(end_time)])
|
|
|
-
|
|
|
- if campaign_ids is not None:
|
|
|
- open_screen_campaign_qs = open_screen_campaign_qs.filter(
|
|
|
- Q(campaign_id_id__isnull=True) | Q(campaign_id_id__in=json.loads(campaign_ids)))
|
|
|
-
|
|
|
- open_screen_campaign_qs = open_screen_campaign_qs.select_related('campaign_id').annotate(
|
|
|
- campaign_name=F('campaign_id__campaign_name'),
|
|
|
- campaign_type=F('campaign_id__campaign_type'),
|
|
|
- campaign_status=F('campaign_id__status')
|
|
|
- ).values('id', 'user_id', 'status', 'update_time', 'create_time', 'campaign_name', 'campaign_type',
|
|
|
- 'campaign_status')
|
|
|
- if not open_screen_campaign_qs.exists():
|
|
|
- return response.json(0, {'list': []})
|
|
|
- campaigns_list = list(open_screen_campaign_qs)
|
|
|
- return response.json(0, {'list': campaigns_list})
|
|
|
+ try:
|
|
|
+ open_screen_campaign_qs = OpenScreenCampaign.objects.filter(update_time__range=[int(start_time), int(end_time)])
|
|
|
+
|
|
|
+ if campaign_ids is not None:
|
|
|
+ open_screen_campaign_qs = open_screen_campaign_qs.filter(
|
|
|
+ Q(campaign_id_id__isnull=True) | Q(campaign_id_id__in=json.loads(campaign_ids)))
|
|
|
+
|
|
|
+ open_screen_campaign_qs = open_screen_campaign_qs.select_related('campaign_id').annotate(
|
|
|
+ campaign_name=F('campaign_id__campaign_name'),
|
|
|
+ campaign_type=F('campaign_id__campaign_type'),
|
|
|
+ campaign_status=F('campaign_id__status')
|
|
|
+ ).values('id', 'user_id', 'status', 'update_time', 'create_time', 'campaign_name', 'campaign_type',
|
|
|
+ 'campaign_status')
|
|
|
+ if not open_screen_campaign_qs.exists():
|
|
|
+ return response.json(0, {'list': []})
|
|
|
+ campaigns_list = list(open_screen_campaign_qs)
|
|
|
+ return response.json(0, {'list': campaigns_list})
|
|
|
+ except Exception as e:
|
|
|
+ return response.json(173)
|
|
|
|
|
|
def get_country_list(self, response):
|
|
|
try:
|