|
@@ -116,9 +116,7 @@ class AiView(View):
|
|
return self.deleteInfo(userID, request_dict, response)
|
|
return self.deleteInfo(userID, request_dict, response)
|
|
elif operation == 'queryorderlist': # 查询订单
|
|
elif operation == 'queryorderlist': # 查询订单
|
|
return self.do_querylist(userID, request_dict, response)
|
|
return self.do_querylist(userID, request_dict, response)
|
|
- elif operation == 'updateJpushTime': # 查询订单
|
|
|
|
- return self.update_jpush_time(userID, request_dict, response)
|
|
|
|
- elif operation == 'updateJpushTime': # 查询订单
|
|
|
|
|
|
+ elif operation == 'updateJpushTime': # 测试ai识别app的推送时间
|
|
return self.update_jpush_time(userID, request_dict, response)
|
|
return self.update_jpush_time(userID, request_dict, response)
|
|
else:
|
|
else:
|
|
return response.json(414)
|
|
return response.json(414)
|
|
@@ -374,7 +372,6 @@ class AiView(View):
|
|
omqs.filter(UID=uid)
|
|
omqs.filter(UID=uid)
|
|
if not omqs.exists():
|
|
if not omqs.exists():
|
|
return response.json(173)
|
|
return response.json(173)
|
|
- # return response.json(10, '订单不存在')
|
|
|
|
count = omqs.count()
|
|
count = omqs.count()
|
|
omqs = omqs.annotate(rank__title=F('ai_rank__title'), rank__content=F('ai_rank__content'),
|
|
omqs = omqs.annotate(rank__title=F('ai_rank__title'), rank__content=F('ai_rank__content'),
|
|
rank__day=F('ai_rank__effective_day'), rank__price=F('ai_rank__price'),
|
|
rank__day=F('ai_rank__effective_day'), rank__price=F('ai_rank__price'),
|
|
@@ -465,7 +462,7 @@ class AiView(View):
|
|
Order_Model.objects.create(orderID=orderID, UID=uid, channel=channel, userID_id=userID,
|
|
Order_Model.objects.create(orderID=orderID, UID=uid, channel=channel, userID_id=userID,
|
|
desc=content, payType=pay_type, payTime=nowTime, price=price,
|
|
desc=content, payType=pay_type, payTime=nowTime, price=price,
|
|
currency=currency, addTime=nowTime, updTime=nowTime, pay_url=pay_url,
|
|
currency=currency, addTime=nowTime, updTime=nowTime, pay_url=pay_url,
|
|
- paymentID=paymentID, ai_rank_id=ai_meal_id, rank_id=1)
|
|
|
|
|
|
+ paymentID=paymentID, ai_rank_id=ai_meal_id, rank_id=1, order_type=1)
|
|
return response.json(0, {"redirectUrl": pay_url, "orderID": orderID})
|
|
return response.json(0, {"redirectUrl": pay_url, "orderID": orderID})
|
|
return response.json(10, 'create_ai_order_failed')
|
|
return response.json(10, 'create_ai_order_failed')
|
|
except Exception as e:
|
|
except Exception as e:
|