Merge branch 'center-channel' of gitlab.gongsibao.com:jiangyong/zhichan into center-channel

center-channel/app/base/api/impl/action/icbcTools.js

@@ -25,16 +25,16 @@ class IcbcToolsAPI extends WEBBase {
         var opResult = null;
         var opResult = null;
         switch (action_type) {
         switch (action_type) {
             case "getCompanyListByVague"://企业模糊查询
             case "getCompanyListByVague"://企业模糊查询
-                opResult = await this.icbcSve.getCompanyListByVague(req.app, action_body.opStr);
+                opResult = await this.icbcSve.getCompanyListByVague(action_body, req);
                 break;
                 break;
             case "getDetailByCompanyName"://企业详情
             case "getDetailByCompanyName"://企业详情
-                opResult = await this.icbcSve.getDetailByCompanyName(req.app, action_body.opStr);
+                opResult = await this.icbcSve.getDetailByCompanyName(action_body, req);
                 break;
                 break;
             case "getCompanyChangeByName"://企业变更记录查询
             case "getCompanyChangeByName"://企业变更记录查询
-                opResult = await this.icbcSve.getCompanyChangeByName(req.app, action_body.opStr);
+                opResult = await this.icbcSve.getCompanyChangeByName(action_body, req);
                 break;
                 break;
             case "getCompanyIcpByName"://工商icp证照查询
             case "getCompanyIcpByName"://工商icp证照查询
-                opResult = await this.icbcSve.getCompanyIcpByName(req.app, action_body.opStr);
+                opResult = await this.icbcSve.getCompanyIcpByName(action_body, req);
                 break;
                 break;
             default:
             default:
                 opResult = system.getResult(null, "action_type参数错误");
                 opResult = system.getResult(null, "action_type参数错误");

center-channel/app/base/service/impl/trademark/icbcSve.js

@@ -7,17 +7,13 @@ class IcbcService extends AppServiceBase {
     super();
     super();
     this.zcApiUrl = settings.reqZcApi();
     this.zcApiUrl = settings.reqZcApi();
   }
   }
+  //企业模糊查询
   async getCompanyListByVague(obj, req) {
   async getCompanyListByVague(obj, req) {
     var url = this.zcApiUrl + "api/tool/toolApi/getCompanyListByVague";
     var url = this.zcApiUrl + "api/tool/toolApi/getCompanyListByVague";
     return await this.opReqResult(url, obj, req);
     return await this.opReqResult(url, obj, req);
   }
   }
-  //企业模糊查询
-  async getDetailByCompanyName(obj, req) {
-    var url = this.zcApiUrl + "api/tool/toolApi/getDetailByCompanyName";
-    return await this.opReqResult(url, queryobj, req);
-  }
   //企业详情
   //企业详情
-  async getNclByLikeNameAndNcl(queryobj, req) {
+  async getDetailByCompanyName(queryobj, req) {
     var url = this.zcApiUrl + "api/tool/toolApi/getNclByLikeNameAndNcl";
     var url = this.zcApiUrl + "api/tool/toolApi/getNclByLikeNameAndNcl";
     return await this.opReqResult(url, queryobj, req);
     return await this.opReqResult(url, queryobj, req);
   }
   }