From af070650138bd36a7e1ef00ac99b2b931ff92fcc Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Mon, 5 Jul 2021 13:26:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E8=BF=87?=
 =?UTF-8?q?=E6=9C=9F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/api.md                               |  9 +++++++--
 src/api/controllers/coupon.controller.ts | 11 ++++++-----
 src/models/user/UserCoupon.ts            |  1 +
 src/models/user/UserReward.ts            |  3 ++-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/doc/api.md b/doc/api.md
index ee04766..2b9ac7e 100644
--- a/doc/api.md
+++ b/doc/api.md
@@ -503,7 +503,8 @@
 	coupon: '券id',
 	couponName: '券名',
 	couponUrl: '券图片url',
-	status: '状态'	//0: 未使用 , 1: 已使用 9: 已过期
+	status: '状态',	//0: 未使用 , 1: 已使用 9: 已过期
+  expire: 0			// 过期时间, 0 为永不过期
 }]
 ```
 
@@ -586,6 +587,7 @@
   count: 1, //数量
   couponUrl: '优惠券详情图的url',
   rewardType: 0, // 0: 优惠券, 1: 抽奖券
+  expire: 0 // 过期时间, 0表示永不过期
 }]
 ```
 
@@ -617,6 +619,7 @@
     count: 1, //数量
     couponUrl: '优惠券详情图的url',
     rewardType: 0, // 0: 优惠券, 1: 抽奖券
+    expire: 0 // 过期时间, 0表示永不过期
   }]
   rewards: [				// 奖励列表
     {
@@ -740,6 +743,7 @@
     count: 1, //数量
     couponUrl: '优惠券详情图的url',
     rewardType: 0, // 0: 优惠券, 1: 抽奖券
+  	expire: 0 // 过期时间, 0表示永不过期
   }]
 ```
 
@@ -866,6 +870,7 @@
 	coupon: '券id',
 	couponName: '券名',
 	couponUrl: '券图片url',
-	status: '状态'	//0: 未使用 , 1: 已使用 9: 已过期
+	status: '状态',	//0: 未使用 , 1: 已使用 9: 已过期
+  expire: 0 // 过期时间, 0表示永不过期
 }
 ```
\ No newline at end of file
diff --git a/src/api/controllers/coupon.controller.ts b/src/api/controllers/coupon.controller.ts
index 92590aa..bbe6d2b 100644
--- a/src/api/controllers/coupon.controller.ts
+++ b/src/api/controllers/coupon.controller.ts
@@ -65,13 +65,14 @@ class CouponController extends BaseController {
     const shop = await Shop.fetchByID(record.shop)
     const coupon = await Coupon.findById(record.item)
     return {
-      id: record.sid,
-      shop: record.shop,
+      id: recordNew.sid,
+      shop: recordNew.shop,
       shopName: shop.showName,
-      coupon: record.item,
+      coupon: recordNew.item,
       couponName: coupon.name,
-      couponUrl: getCouponUrl(shop.id, record.item),
-      status: record.status,
+      couponUrl: getCouponUrl(shop.id, recordNew.item),
+      status: recordNew.status,
+      expire: recordNew.expire,
     }
   }
 }
diff --git a/src/models/user/UserCoupon.ts b/src/models/user/UserCoupon.ts
index 6f13c13..b387528 100644
--- a/src/models/user/UserCoupon.ts
+++ b/src/models/user/UserCoupon.ts
@@ -172,6 +172,7 @@ class UserCouponClass extends BaseModule {
         couponName: couponMap.get(record.item).name,
         couponUrl: getCouponUrl(sid, record.item),
         status: record.status,
+        expire: record.expire || 0,
       })
     }
     return results
diff --git a/src/models/user/UserReward.ts b/src/models/user/UserReward.ts
index b25f438..11aa118 100644
--- a/src/models/user/UserReward.ts
+++ b/src/models/user/UserReward.ts
@@ -109,6 +109,7 @@ class UserRewardClass extends BaseModule {
     let name = ''
     let url = ''
     let rewardType = 0
+    let expire = 0
     if (itemId === LOTTERY_TICKET) {
       rewardType = 1
       await saveRecord(1, count)
@@ -120,7 +121,6 @@ class UserRewardClass extends BaseModule {
       await saveRecord(0, count)
       let cdata = await Coupon.findById(itemId)
       name = cdata.name
-      let expire = 0
       if (cdata.validDays) {
         expire = Date.now() + cdata.validDays * 24 * 60 * 60 * 1000
       }
@@ -136,6 +136,7 @@ class UserRewardClass extends BaseModule {
       couponUrl: url,
       ids,
       rewardType,
+      expire,
     }
   }
   /**