node/corgi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

挑战返回多条

Browse Source
This commit is contained in:
zhl 2021-05-17 11:23:36 +08:00
parent 7ab55c8556
commit 07d1de0859
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/api.md
View File

@ -310,10 +310,11 @@
"name": "一品漫城", // 店铺名 "name": "一品漫城", // 店铺名
"area": "上海市-上海市-闵行区", // 区域 "area": "上海市-上海市-闵行区", // 区域
"logo": "https://resource.kingsome.cn/game607fd53cb40504740fdccb13.png", // 店铺logo "logo": "https://resource.kingsome.cn/game607fd53cb40504740fdccb13.png", // 店铺logo
"exam": { // 店铺测验信息 "exams": [{ // 店铺测验信息
"id": "609e13eeccc78154ac683583", //id "id": "609e13eeccc78154ac683583", //id
"name": "第一期测试" // 测验 "name": "第一期测试", // 测验
}, "desc": "简介"
}],
"activity": { // 活动信息 "activity": { // 活动信息
"id": "608bdf61cecfcc2f45247663", // 活动id "id": "608bdf61cecfcc2f45247663", // 活动id
"name": "第一个活动", // 活动名 "name": "第一个活动", // 活动名

0
src/admin/controllers/shop_exam.controller.ts Normal file
View File

10
src/api/controllers/shop.controller.ts
View File

@ -105,9 +105,13 @@ class ShopController extends BaseController {
rspData.area = shop.areaStr rspData.area = shop.areaStr
rspData.logo = shop.logo rspData.logo = shop.logo
const now = Date.now() const now = Date.now()
let exam = await ShopExam.findOne({shop: sid, beginTime: {$lte: now}, endTime: {$gte: now}, active: true, deleted: false}) let exams = await ShopExam.find({shop: sid, beginTime: {$lte: now}, endTime: {$gte: now}, active: true, deleted: false})
if (exam) { if (exams && exams.length > 0) {
rspData.exam = {id : exam.id, name: exam.name, desc: exam.desc} let datas: any = []
for (let exam of exams) {
datas.push({ id: exam.id, name: exam.name, desc: exam.desc })
}
rspData.exams = datas
} }
let activity = await ShopActivity.getActivityOne(sid) let activity = await ShopActivity.getActivityOne(sid)
rspData.activity = activity rspData.activity = activity