|
@@ -119,7 +119,7 @@ class AiView(View):
|
|
|
return self.deleteInfo(userID, request_dict, response)
|
|
|
elif operation == 'queryorderlist': # 查询订单
|
|
|
return self.do_querylist(userID, request_dict, response)
|
|
|
- elif operation == 'getUsingPackage': # 获取设备当前使用的ai套餐
|
|
|
+ elif operation == 'getUsingPackage': # 获取当前使用的ai套餐
|
|
|
return self.getUsingPackage(request_dict, userID, response)
|
|
|
else:
|
|
|
return response.json(414)
|
|
@@ -364,7 +364,7 @@ class AiView(View):
|
|
|
print(e)
|
|
|
return response.json(500, repr(e))
|
|
|
|
|
|
- # 获取设备当前使用的ai套餐
|
|
|
+ # 获取当前使用的ai套餐
|
|
|
def getUsingPackage(self, request_dict, userID, response):
|
|
|
uid = request_dict.get('uid', None)
|
|
|
lang = request_dict.get('lang', 'en')
|
|
@@ -372,13 +372,13 @@ class AiView(View):
|
|
|
# if not dv_qs.exists():
|
|
|
# return response.json(12)
|
|
|
try:
|
|
|
- ai_service_qs = AiService.objects.filter(uid=uid, use_status=1)
|
|
|
+ ai_service_qs = AiService.objects.filter(uid=uid, use_status=1, orders__ai_rank__lang__lang=lang)
|
|
|
if not ai_service_qs.exists():
|
|
|
return response.json(0, [])
|
|
|
|
|
|
# 计算套餐过期时间
|
|
|
sum_end_time = AiService.objects.filter(Q(uid=uid), ~Q(use_status=2)).aggregate(Sum('endTime'))['endTime__sum']
|
|
|
- ai_service_qs = ai_service_qs.order_by('addTime').annotate(bucket__content=F('orders__ai_rank__title')).\
|
|
|
+ ai_service_qs = ai_service_qs.order_by('addTime').annotate(bucket__content=F('orders__ai_rank__lang__title')).\
|
|
|
values('uid', 'use_status', 'bucket__content')
|
|
|
ai_service_data = ai_service_qs[0]
|
|
|
ai_service_data['endTime'] = sum_end_time
|