Commit 0154b766 authored by 姜登's avatar 姜登

gjjh5

parent 228a5682
Pipeline #6839 passed with stage
in 3 seconds
......@@ -3,6 +3,13 @@
const Controller = require('egg').Controller;
class ScriptController extends Controller {
constructor(ctx) {
super(ctx);
this.cityListRule = {
appKey: 'string',
};
}
async fetchScripts() {
const { ctx, service } = this;
const { appKey } = ctx.query;
......@@ -22,6 +29,34 @@ class ScriptController extends Controller {
ctx.success(data);
}
async partnerScripts() {
const { ctx, service } = this;
try {
ctx.validate(this.cityListRule, ctx.query);
const { appKey } = ctx.query;
let limitScriptsList = false;
const ret = await service.partner.fetchInfo(appKey);
if (ret) {
limitScriptsList = ret.hfExcludeScripts;
} else {
ctx.error({ message: '无效的appKey' });
return;
}
let data = await service.scripts.fetchScripts();
if (limitScriptsList) {
data = data.filter(item => {
return !(limitScriptsList.includes(item.id));
});
}
ctx.body = {
code: 0,
data,
};
} catch (err) {
ctx.error(err);
}
}
async fetchOneScripts() {
const { ctx, service } = this;
let { scriptId } = ctx.params;
......
......@@ -32,7 +32,7 @@ module.exports = {
this.body = { code: -1, msg: '请求参数有误' };
return;
}
if (!/token/.test(err.message)) {
if (!/token|appKey/.test(err.message)) {
if (/[a-zA-Z]+/.test(err.message)) {
this.body = { code: err.code || -1, msg: '系统错误, 请稍后再试' };
return;
......
......@@ -40,6 +40,8 @@ module.exports = app => {
gjjRouter.post('/getCityConfig', controller.task.fetchCityConfig);// 获取城市配置
gjjRouter.get('/getCityList', controller.script.partnerScripts);// 获取城市列表状态
gjjRouter.get('/orderData/:appKey/:orderId', controller.order.orderShow);// 获取展示页面数据
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment