From 14ad9c689dc9b4f285466c1faf1a6e64f42c7f20 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Tue, 6 Jul 2021 12:17:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BA=97=E9=93=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=20=E7=9A=84=E6=8C=91=E6=88=98=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=20beginTime=E5=92=8CendTim?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/api.md                             |  3 +++
 src/api/controllers/shop.controller.ts | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/doc/api.md b/doc/api.md
index 32c298f..d363690 100644
--- a/doc/api.md
+++ b/doc/api.md
@@ -32,6 +32,7 @@
 1. 增加[开始分享优惠券](#223), [领取分享的优惠券](#224), [优惠券详情](#225) 接口
 2. [用户券列表](#211), [抽奖](#214), [邀请奖励信息](#215), [领取邮件附件](#217)等接口返回的优惠券信息, 增加expire字段
 3. [获取店铺信息](#208) 的gamecfg增加返回 default_desc_txt, 用于首页介绍文字
+4. [获取店铺信息](#208) 的挑战列表增加返回 beginTime和endTime
 
 
 
@@ -372,6 +373,8 @@
           	"desc": "简介",
           	"icon": "",												// 相关icon
             "banner": "",											// 介绍大图
+          	"beginTime": 121212121,						// 开始时间
+          	"endTime": 12312312312						// 结束时间
         }],
         "activity": {													// 活动信息
             "id": "608bdf61cecfcc2f45247663",	// 活动id
diff --git a/src/api/controllers/shop.controller.ts b/src/api/controllers/shop.controller.ts
index 2712b1c..8290a58 100644
--- a/src/api/controllers/shop.controller.ts
+++ b/src/api/controllers/shop.controller.ts
@@ -121,7 +121,15 @@ class ShopController extends BaseController {
     if (exams && exams.length > 0) {
       let datas: any = []
       for (let exam of exams) {
-        datas.push({ id: exam.id, name: exam.name, desc: exam.desc, icon: exam.icon, banner: exam.banner })
+        datas.push({
+          id: exam.id,
+          name: exam.name,
+          desc: exam.desc,
+          icon: exam.icon,
+          banner: exam.banner,
+          beginTime: exam.beginTime,
+          endTime: exam.endTime,
+        })
       }
       rspData.exams = datas
     }