|
@@ -213,8 +213,8 @@ class CloudStorageView(View):
|
|
|
qs = Store_Meal.objects
|
|
|
eq = ExperienceContextModel.objects.filter(uid=uid, experience_type=0).values('id')
|
|
|
|
|
|
- userObj = Device_User.objects.get(userID=userID)
|
|
|
- regionObj = RegionCountryModel.objects.get(number=userObj.region_country)
|
|
|
+ #userObj = Device_User.objects.get(userID=userID)
|
|
|
+ #regionObj = RegionCountryModel.objects.get(number=userObj.region_country)
|
|
|
|
|
|
if mold:
|
|
|
qs = qs.filter(bucket__mold=mold,lang__lang=lang)
|
|
@@ -227,7 +227,7 @@ class CloudStorageView(View):
|
|
|
qs = qs.filter(pay_type='10')
|
|
|
|
|
|
qs = qs.filter(~Q(pay_type='11')) # 过滤不显示激活码套餐
|
|
|
- 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.values("id", "title", "content", "price", "day", "currency", "bucket__storeDay",
|
|
|
"bucket__bucket", "bucket__area", "commodity_code",
|