taxH5 修改获取城市配置接口+通知优化

app/controller/script.js

@@ -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;
@@ -71,6 +78,36 @@ class ScriptController extends Controller {
     const data = await service.scripts.fetchHubSeripts(hubId);
     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.itExcludeScripts;
+      } else {
+        ctx.error({ message: '无效的appKey' });
+        return;
+      }
+      let data = await service.scripts.fetchScripts();
+      if (limitScriptsList) {
+        data = data.filter(item => {
+          if (item.state === 'offline' || item.state === 'online') {
+            return !(limitScriptsList.includes(item.id));
+          }
+        });
+      }
+      ctx.body = {
+        code: 0,
+        data,
+      };
+    } catch (err) {
+      ctx.error(err);
+    }
+  }
 }
 
 module.exports = ScriptController;

app/extend/context.js

@@ -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;

app/router.js

@@ -36,7 +36,8 @@ module.exports = app => {
   itRouter.post('/getToken', controller.token.partnerToken);     // 合作方获取token
   itRouter.post('/getorderSn', controller.order.partnerOrder);   // 合作方获取orderSn
 
-  itRouter.post('/getCityConfig', controller.task.cityConfigs);        // 获取城市配置
+  itRouter.post('/getCityConfig', controller.task.cityConfigs);        // 获取城市配置 老接口备用
+  itRouter.get('/getCityList', controller.script.partnerScripts);//合作方获取城市配置
   itRouter.post('/getData', controller.order.partnerData);       // 合作方拉数据
 
   itRouter.get('/orderData/:appKey/:orderId', controller.order.orderShow);//获取展示页面数据