|
@@ -1143,7 +1143,7 @@ class CloudStorageView(View):
|
|
|
smqs = Store_Meal.objects.filter(id=rank, pay_type=pay_type, lang__lang=lang). \
|
|
|
values('currency', 'price', 'lang__content', 'day',
|
|
|
'commodity_type', 'lang__title',
|
|
|
- 'expire', 'commodity_code', 'discount_price')
|
|
|
+ 'expire', 'commodity_code', 'discount_price', 'bucket__mold')
|
|
|
if not smqs.exists():
|
|
|
return response.json(173)
|
|
|
currency = smqs[0]['currency']
|
|
@@ -1160,6 +1160,13 @@ class CloudStorageView(View):
|
|
|
# ubqs_count = ubqs.count()
|
|
|
# ubq = ubqs[ubqs_count - 1, ubqs_count]
|
|
|
# new_starTime = ubq['endTime'] + 1
|
|
|
+ is_mold = 0 #判断国内外
|
|
|
+ if smqs[0]['bucket__mold']==0:
|
|
|
+ is_mold = 1
|
|
|
+
|
|
|
+ order_qs = Order_Model.objects.filter(UID=uid , rank__bucket__mold=is_mold)
|
|
|
+ if order_qs.exists():
|
|
|
+ return response.json(10041)
|
|
|
|
|
|
orderID = CommonService.createOrderID()
|
|
|
if pay_type == 1:
|