|
@@ -9,6 +9,8 @@ from Model.models import CouponModel
|
|
from Object.ResponseObject import ResponseObject
|
|
from Object.ResponseObject import ResponseObject
|
|
from Object.TokenObject import TokenObject
|
|
from Object.TokenObject import TokenObject
|
|
from django.db.models import Q, F, Count
|
|
from django.db.models import Q, F, Count
|
|
|
|
+from django.http import JsonResponse, HttpResponseRedirect, HttpResponse
|
|
|
|
+from Service.CommonService import CommonService
|
|
|
|
|
|
|
|
|
|
# 优惠券
|
|
# 优惠券
|
|
@@ -45,7 +47,9 @@ class CouponView(View):
|
|
nowTime = int(time.time())
|
|
nowTime = int(time.time())
|
|
couponObj = CouponModel.objects.filter(userID_id=userID,use_status=0,distributeTime__lte=nowTime,
|
|
couponObj = CouponModel.objects.filter(userID_id=userID,use_status=0,distributeTime__lte=nowTime,
|
|
valid_time__gt=nowTime).annotate(coupon_id=F('id')).values(
|
|
valid_time__gt=nowTime).annotate(coupon_id=F('id')).values(
|
|
- "coupon_id","type","coupon_discount")
|
|
|
|
|
|
+ "coupon_id","type","coupon_discount","valid_time")
|
|
|
|
+ for couponList in couponObj:
|
|
|
|
+ couponList['valid_time'] = CommonService.timestamp_to_str(couponList['valid_time'])
|
|
result = {
|
|
result = {
|
|
'count':couponObj.count(),
|
|
'count':couponObj.count(),
|
|
'couponList':list(couponObj),
|
|
'couponList':list(couponObj),
|