|
|
@@ -23,7 +23,7 @@ from Ansjer.us_config.config_test import PAYPAL_CRD
|
|
|
from Object.AliPayObject import AliPayObject
|
|
|
from Object.ResponseObject import ResponseObject
|
|
|
from Object.TokenObject import TokenObject
|
|
|
-from Model.models import Order_Model, Device_Info, UidSetModel
|
|
|
+from Model.models import Order_Model, Device_Info, UidSetModel, Store_Meal
|
|
|
from Service.CommonService import CommonService
|
|
|
from Service.ModelService import ModelService
|
|
|
from Ansjer.config import CONFIG_INFO, CONFIG_CN
|
|
|
@@ -108,7 +108,7 @@ class OrderView(View):
|
|
|
order_ql = omqs.values("orderID", "UID", "channel", "desc", "price", "currency",
|
|
|
"addTime", "rank__lang__new_title", "rank__pixel_level", "rank__commodity_code",
|
|
|
"updTime", "paypal", "rank__day", "payType", 'ai_rank', 'ai_rank__lang__title',
|
|
|
- "rank__price", "status", "rank__is_ai", "rank__pay_type__id", 'ai_rank__lang__content',
|
|
|
+ "rank__price", "status", "rank__is_ai", 'ai_rank__lang__content',
|
|
|
"rank__content", "rank__title", "rank__currency",
|
|
|
"rank_id", "rank__expire", 'store_meal_name', 'order_type')[
|
|
|
(page - 1) * line:page * line]
|
|
|
@@ -168,7 +168,8 @@ class OrderView(View):
|
|
|
else:
|
|
|
d['rank__title'] = d['rank__lang__new_title'].get('2', '')
|
|
|
else: # cdk套餐
|
|
|
- if d['rank__pay_type__id'] != 11:
|
|
|
+ store_qs = Store_Meal.objects.filter(id=d['rank_id']).values('pay_type')
|
|
|
+ if store_qs[0]['pay_type'] != 11:
|
|
|
if d['rank__pixel_level'] == 0 and d['rank__is_ai'] == 0:
|
|
|
d['rank__title'] = d['rank__lang__new_title'].get('1', '')
|
|
|
elif d['rank__pixel_level'] == 1 and d['rank__is_ai'] == 0:
|
