From 56471b92b7e63be9fde139a0b0304ddad83d58a0 Mon Sep 17 00:00:00 2001 From: zhl Date: Fri, 11 Jun 2021 10:39:47 +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=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20local,=20=E7=94=A8=E4=BA=8E=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=BD=BF=E7=94=A8=E6=9C=AC=E5=9C=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/api.md | 31 +++++++++++++++++++------- src/api/controllers/shop.controller.ts | 1 + src/models/shop/Shop.ts | 6 +++++ 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/doc/api.md b/doc/api.md index 4a7fb5f..370ec13 100644 --- a/doc/api.md +++ b/doc/api.md @@ -9,6 +9,21 @@ 4. 上报测验题目答案相关接口的 奖励信息 增加返回rewardType, 0: 表明该奖励为优惠券, 1: 抽奖券 5. 用户信息上报接口 增加上报当前店铺 +### 20200609 +1. 增加 [邮件列表](#217), [设置邮件已读](#218), [领取邮件附件](#219), [删除邮件](#220) + +### 20200610 + +1. 增加 [显示正确答案](#221) +2. 增加 [公告列表](#222) + + + +### 20200611 + +1. [获取店铺信息](#208) 增加返回字段 local, 用于表示是否使用本地数据 + + @@ -318,7 +333,7 @@ ### 8. 获取店铺信息 1. Method: POST -2. URI: /api/:accountid/shop +2. URI: /api/:accountid/shop | 字段 | 说明 | | -------- | -------------------------------------- | @@ -339,6 +354,7 @@ "numid": 1002, // 店铺的数字编号 "name": "一品漫城", // 店铺名 "area": "上海市-上海市-闵行区", // 区域 + "local": 0, // 是否使用本地数据, 0: 否, 1: 是 "logo": "https://resource.kingsome.cn/game607fd53cb40504740fdccb13.png", // 店铺logo "exams": [{ // 店铺测验信息 "id": "609e13eeccc78154ac683583", //id @@ -648,7 +664,7 @@ ### 17. 邮件列表 1. Method: POST -2. URI: /api/:accountid/mails +2. URI: /api/:accountid/mails | 字段 | 说明 | | -------- | -------------------------------------- | @@ -680,7 +696,7 @@ ### 18. 设置邮件已读 1. Method: POST -2. URI: /api/:accountid/mail/read +2. URI: /api/:accountid/mail/read | 字段 | 说明 | | -------- | -------------------------------------- | @@ -696,7 +712,7 @@ ### 19. 领取邮件附件 1. Method: POST -2. URI: /api/:accountid/mail/attachment +2. URI: /api/:accountid/mail/attachment | 字段 | 说明 | | -------- | -------------------------------------- | @@ -724,7 +740,7 @@ ### 20. 删除邮件 1. Method: POST -2. URI: /api/:accountid/mail/delete +2. URI: /api/:accountid/mail/delete | 字段 | 说明 | | -------- | -------------------------------------- | @@ -741,7 +757,7 @@ ### 21. 显示正确答案 1. Method: POST -2. URI: /api/:accountId/puzzle/help +2. URI: /api/:accountId/puzzle/help | 字段 | 说明 | | -------- | -------------------------------------- | @@ -764,12 +780,11 @@ ``` > 说明, 这里获取的answer是使用 当前比赛session_当前题目的id_答案_jcfw中的sessionid, 计算md5 -> ### 22. 公告列表 1. Method: POST -2. URI: /api/:accountId/announces +2. URI: /api/:accountId/announces | 字段 | 说明 | | -------- | -------------------------------------- | diff --git a/src/api/controllers/shop.controller.ts b/src/api/controllers/shop.controller.ts index 812713f..2712b1c 100644 --- a/src/api/controllers/shop.controller.ts +++ b/src/api/controllers/shop.controller.ts @@ -109,6 +109,7 @@ class ShopController extends BaseController { rspData.name = shop.showName rspData.area = shop.areaStr rspData.logo = shop.logo + rspData.local = shop.local || 0 const now = Date.now() let exams = await ShopExam.find({ shop: shop.id, diff --git a/src/models/shop/Shop.ts b/src/models/shop/Shop.ts index af53a8b..09e21eb 100644 --- a/src/models/shop/Shop.ts +++ b/src/models/shop/Shop.ts @@ -86,6 +86,12 @@ class ShopClass extends BaseModule { */ @prop() public lat: number + /** + * 是否使用本地数据 + * @type {number} + */ + @prop({ default: 0 }) + public local: number @prop({ type: () => [Number] }) public location: number[]