|
|
@@ -14,7 +14,7 @@ from boto3.session import Session
|
|
|
from django.http import JsonResponse, HttpResponseRedirect, HttpResponse, StreamingHttpResponse
|
|
|
from django.views.generic.base import View
|
|
|
from Model.models import Device_Info, Role, MenuModel, VodBucketModel, CDKcontextModel, Store_Meal, Order_Model, \
|
|
|
- UID_Bucket, ExperienceContextModel, Lang, Device_User, CloudLogModel, UidSetModel
|
|
|
+ UID_Bucket, ExperienceContextModel, Lang, Device_User, CloudLogModel, UidSetModel, Unused_Uid_Meal
|
|
|
from Object.ResponseObject import ResponseObject
|
|
|
from Object.TokenObject import TokenObject
|
|
|
from Object.UidTokenObject import UidTokenObject
|
|
|
@@ -845,16 +845,24 @@ class serveManagement(View):
|
|
|
uid_bucket_qs = uid_bucket_qs.order_by('-addTime')[(page - 1) * line:page * line]
|
|
|
|
|
|
for uid_bucket in uid_bucket_qs:
|
|
|
+ # 套餐到期时间累加未使用套餐
|
|
|
+ unused_qs = Unused_Uid_Meal.objects.filter(uid=uid_bucket.uid).values('num', 'expire')
|
|
|
+ if unused_qs.exists():
|
|
|
+ addMonth = 0
|
|
|
+ for unused in unused_qs:
|
|
|
+ addMonth += unused['num'] * unused['expire']
|
|
|
+ endTime = CommonService.calcMonthLater(addMonth, uid_bucket.endTime)
|
|
|
+ endTime = time.strftime("%Y--%m--%d %H:%M:%S", time.localtime(endTime))
|
|
|
+ else:
|
|
|
+ endTime = time.strftime("%Y--%m--%d %H:%M:%S", time.localtime(uid_bucket.endTime))
|
|
|
+
|
|
|
uid = uid_bucket.uid.upper()
|
|
|
data = {
|
|
|
'id': uid_bucket.id,
|
|
|
'uid': uid,
|
|
|
'channel': uid_bucket.channel,
|
|
|
'status': uid_bucket.status,
|
|
|
- 'endTime': time.strftime(
|
|
|
- "%Y--%m--%d %H:%M:%S",
|
|
|
- time.localtime(
|
|
|
- uid_bucket.endTime)),
|
|
|
+ 'endTime': endTime,
|
|
|
'addTime': time.strftime(
|
|
|
"%Y--%m--%d %H:%M:%S",
|
|
|
time.localtime(
|
