|
|
@@ -220,9 +220,10 @@ class CloudStorageView(View):
|
|
|
store_qs = store_qs.filter(pay_type='10') # 体验套餐不区分像素等级
|
|
|
|
|
|
store_qs = store_qs.annotate(title=F('lang__title'), content=F('lang__content'),
|
|
|
+ new_title=F('lang__new_title'),
|
|
|
discount_content=F('lang__discount_content'))
|
|
|
store_qs = store_qs.order_by('sort').values("id", "title", "content", "price", "day", "currency",
|
|
|
- "bucket__storeDay", "rank__lang__new_title",
|
|
|
+ "bucket__storeDay", "new_title",
|
|
|
"bucket__bucket", "bucket__area", "commodity_code",
|
|
|
"commodity_type", "is_discounts", "virtual_price", "expire",
|
|
|
"discount_price", "discount_content", "symbol", "cycle_config_id")
|
|
|
@@ -245,13 +246,13 @@ class CloudStorageView(View):
|
|
|
for each in item['pay_type']:
|
|
|
if each['id'] == 10:
|
|
|
if pixel_level == 0 and is_ai == 0:
|
|
|
- item['rank__title'] = item['rank__lang__new_title'].get('1', '')
|
|
|
+ item['content'] = item['new_title'].get('1', '')
|
|
|
elif pixel_level == 1 and is_ai == 0:
|
|
|
- item['content'] = item['rank__lang__new_title'].get('2', '')
|
|
|
+ item['content'] = item['new_title'].get('2', '')
|
|
|
elif pixel_level == 0 and is_ai == 1:
|
|
|
- item['content'] = item['rank__lang__new_title'].get('3', '')
|
|
|
+ item['content'] = item['new_title'].get('3', '')
|
|
|
elif pixel_level == 1 and is_ai == 1:
|
|
|
- item['content'] = item['rank__lang__new_title'].get('4', '')
|
|
|
+ item['content'] = item['new_title'].get('4', '')
|
|
|
res_c = {'area': area, 'items': items_list}
|
|
|
res.append(res_c)
|
|
|
# 是否促销
|
