|
@@ -219,7 +219,7 @@ class CloudStorageView(View):
|
|
#qs = qs.filter(id='11111111')
|
|
#qs = qs.filter(id='11111111')
|
|
#qs = qs.filter(bucket__region_id=regionObj.region_id) # 过滤大洲
|
|
#qs = qs.filter(bucket__region_id=regionObj.region_id) # 过滤大洲
|
|
qs = qs.annotate(title=F('lang__title'),content=F('lang__content'),discount_content=F('lang__discount_content'))
|
|
qs = qs.annotate(title=F('lang__title'),content=F('lang__content'),discount_content=F('lang__discount_content'))
|
|
- qs = qs.values("id", "title", "content", "price", "day", "currency", "bucket__storeDay",
|
|
|
|
|
|
+ qs = qs.order_by('sort').values("id", "title", "content", "price", "day", "currency", "bucket__storeDay",
|
|
"bucket__bucket", "bucket__area", "commodity_code",
|
|
"bucket__bucket", "bucket__area", "commodity_code",
|
|
"commodity_type", "is_discounts", "virtual_price", "expire",
|
|
"commodity_type", "is_discounts", "virtual_price", "expire",
|
|
"discount_price", "discount_content", "symbol","cycle_config_id")
|
|
"discount_price", "discount_content", "symbol","cycle_config_id")
|