|
|
@@ -798,12 +798,16 @@ class serveManagement(View):
|
|
|
}
|
|
|
# 订单显示(或不显示)停用/退款功能
|
|
|
if order['order_type'] == 0 or order['order_type'] == 1: # 云存
|
|
|
- uid_bucket = UID_Bucket.objects.filter(uid=order['UID']).values('use_status')
|
|
|
- user_status = uid_bucket[0]['use_status'] if uid_bucket.exists() else ''
|
|
|
- if user_status != '':
|
|
|
- data['user_status'] = user_status
|
|
|
+ uid_bucket = UID_Bucket.objects.filter(uid=order['UID'], orderId=order['orderID'], use_status=1)
|
|
|
+ unused_uid_qs = Unused_Uid_Meal.objects.filter(uid=order['UID'], order_id=order['orderID'])
|
|
|
+ if uid_bucket.exists() or unused_uid_qs.exists():
|
|
|
+ data['user_status'] = 1
|
|
|
else:
|
|
|
- data['user_status'] = 2
|
|
|
+ uid_bucket_qs = UID_Bucket.objects.filter(uid=order['UID'], orderId='', use_status=1)
|
|
|
+ if uid_bucket_qs.exists():
|
|
|
+ data['user_status'] = 1
|
|
|
+ else:
|
|
|
+ data['user_status'] = 2
|
|
|
# elif order['order_type'] == 1: # ai
|
|
|
# ai_service_qs = AiService.objects.filter(
|
|
|
# Q(orders_id=order['orderID']) & ~Q(use_status=2))
|
|
|
@@ -1229,7 +1233,8 @@ class serveManagement(View):
|
|
|
if UID_Bucket.objects.filter(uid=new_uid).exists():
|
|
|
UID_Bucket.objects.filter(uid=new_uid).update(status=1, orderId=orderID, updateTime=nowTime,
|
|
|
use_status=1, has_unused=0, endTime=endTime,
|
|
|
- bucket_id=unused['bucket_id'], channel=unused['channel'],
|
|
|
+ bucket_id=unused['bucket_id'],
|
|
|
+ channel=unused['channel'],
|
|
|
addTime=unused['addTime'])
|
|
|
data_dict = {
|
|
|
'uid': new_uid,
|
|
|
@@ -1250,10 +1255,13 @@ class serveManagement(View):
|
|
|
return response.json(10014)
|
|
|
if new_aiservice.exists():
|
|
|
new_aiservice.update(channel=unused['channel'], detect_status=1, addTime=nowTime,
|
|
|
- updTime=nowTime, endTime=endTime, use_status=1, orders_id=unused['order_id'])
|
|
|
+ updTime=nowTime, endTime=endTime, use_status=1,
|
|
|
+ orders_id=unused['order_id'])
|
|
|
else:
|
|
|
- AiService.objects.create(uid=new_uid, channel=unused['channel'], detect_status=1, addTime=nowTime,
|
|
|
- updTime=nowTime, endTime=endTime, use_status=1, orders_id=unused['order_id'])
|
|
|
+ AiService.objects.create(uid=new_uid, channel=unused['channel'], detect_status=1,
|
|
|
+ addTime=nowTime,
|
|
|
+ updTime=nowTime, endTime=endTime, use_status=1,
|
|
|
+ orders_id=unused['order_id'])
|
|
|
|
|
|
Unused_Uid_Meal.objects.filter(order_id=orderID).first().delete()
|
|
|
|
|
|
@@ -1262,7 +1270,8 @@ class serveManagement(View):
|
|
|
|
|
|
# 订单套餐已使用
|
|
|
else:
|
|
|
- old_using_uid_bucket = old_using_uid_bucket.values('id', 'bucket_id', 'has_unused', 'bucket__content').order_by('addTime')
|
|
|
+ old_using_uid_bucket = old_using_uid_bucket.values('id', 'bucket_id', 'has_unused',
|
|
|
+ 'bucket__content').order_by('addTime')
|
|
|
old_ai_service = AiService.objects.filter(uid=old_uid, endTime__gte=nowTime, use_status=1).values('id',
|
|
|
'detect_interval',
|
|
|
'detect_status',
|
