瀏覽代碼

优惠券接口新增过期时间字段

lang 3 年之前
父節點
當前提交
5c7e8cf115
共有 1 個文件被更改,包括 5 次插入1 次删除
  1. 5 1
      Controller/CouponController.py

+ 5 - 1
Controller/CouponController.py

@@ -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),