|
|
@@ -2,6 +2,7 @@
|
|
|
# -*- coding: utf-8 -*-
|
|
|
import time
|
|
|
|
|
|
+from django.db.models import F
|
|
|
from django.views.generic.base import View
|
|
|
|
|
|
from Model.models import Lang, AiStoreMeal, AiService, Order_Model, Device_User, CountryModel, UidSetModel
|
|
|
@@ -318,7 +319,8 @@ class AiServeView(View):
|
|
|
return response.json(0, [])
|
|
|
|
|
|
count = ai_service_qs.count()
|
|
|
- ai_service_qs = ai_service_qs.values(
|
|
|
+ ai_service_qs = ai_service_qs.annotate(
|
|
|
+ user_name=F('orders__userID__username')).values(
|
|
|
'id',
|
|
|
'uid',
|
|
|
'channel',
|
|
|
@@ -327,7 +329,7 @@ class AiServeView(View):
|
|
|
'detect_group',
|
|
|
'endTime',
|
|
|
'addTime',
|
|
|
- 'updTime', ).order_by('-addTime')
|
|
|
+ 'updTime', 'user_name').order_by('-addTime')
|
|
|
ai_service_qs = ai_service_qs[(page - 1) * line:page * line]
|
|
|
return response.json(
|
|
|
0, {'list': list(ai_service_qs), 'total': count})
|
