fix dev tmquery

zhiquanquan/app/base/controller/impl/trademark/searchCtl.js

@@ -4,8 +4,8 @@ const querystring = require('querystring');
 let settings = require("../../../../config/settings");
 let settings = require("../../../../config/settings");
 const CtlBase = require("../../ctl.base");
 const CtlBase = require("../../ctl.base");
 const logCtl = system.getObject("web.common.oplogCtl");
 const logCtl = system.getObject("web.common.oplogCtl");
-// const tmtransactionPath = "/api/action/tmQuery/springBoard";
-// const tmurl = settings.channelApiUrl() + tmtransactionPath;
+const tmtransactionPath = "/api/action/tmQuery/springBoard";
+let tmurl = settings.channelApiUrl();
 //标源检索
 //标源检索
 class searchCtl extends CtlBase {
 class searchCtl extends CtlBase {
     constructor() {
     constructor() {
@@ -40,31 +40,32 @@ class searchCtl extends CtlBase {
                 "nclNum": [],//尼斯大类
                 "nclNum": [],//尼斯大类
             }
             }
         };
         };
-        var tmurl = settings.channelApiUrl();
         if (Object.keys(p.search).length > 0) {
         if (Object.keys(p.search).length > 0) {
             if (p.search.sbzch) {//注册号查询
             if (p.search.sbzch) {//注册号查询
-                // query.actionType = "findTrademarkzchAccurate";
-                tmurl = tmurl + "/api/trademark/tmqueryApi/findTrademarkzchAccurate";
+                query.actionType = "findTrademarkzchAccurate";
+                buildtmqueyUrl("/api/trademark/tmqueryApi/findTrademarkzchAccurate");
                 query.actionBody.regNum = p.search.sbzch
                 query.actionBody.regNum = p.search.sbzch
             } else if (p.search.zcr) {//申请人查询
             } else if (p.search.zcr) {//申请人查询
-                // query.actionType = "findTrademarkzcr";
-                tmurl = tmurl + "/api/trademark/tmqueryApi/findTrademarkzcr";
+                query.actionType = "findTrademarkzcr";
+                buildtmqueyUrl(tmurl + "/api/trademark/tmqueryApi/findTrademarkzcr");
                 query.actionBody.regMan = p.search.zcr
                 query.actionBody.regMan = p.search.zcr
             } else if (p.search.sbmc) {//商标名称查询
             } else if (p.search.sbmc) {//商标名称查询
-                // query.actionType = "findTrademarkNameAccurate";
-                tmurl = tmurl + "/api/trademark/tmqueryApi/findTrademarkNameAccurate";
+                query.actionType = "findTrademarkNameAccurate";
+                buildtmqueyUrl("/api/trademark/tmqueryApi/findTrademarkNameAccurate");
                 query.actionBody.tmName = p.search.sbmc
                 query.actionBody.tmName = p.search.sbmc
             }
             }
         } else {
         } else {
-            console.log("===============search====search=======>");
-            return;
+            return system.getResultFail(-1,"query params is empty");
+        }
+        let token = "";
+        if (settings.env == "dev"){
+        let tokenInfo = await this.service.getToken();
+            token = tokenInfo.data.token
+        } else {
+           query = query.actionBody
         }
         }
-        // let tokenInfo = await this.service.getToken();
-        // console.log("==========================>",tokenInfo)
-        // console.log("==========================>",tokenInfo.data.token)
         try {
         try {
-            let rtn = await this.execClient.execPostTK(query.actionBody, tmurl, "");
-            console.log(rtn, "============rtn==============>");
+            let rtn = await this.execClient.execPostTK(query, tmurl, token);
             let data = rtn.data;
             let data = rtn.data;
             let published = await this.service.findAll({ company_id: p.company_id });
             let published = await this.service.findAll({ company_id: p.company_id });
             data.rows.forEach(item => {
             data.rows.forEach(item => {
@@ -75,11 +76,17 @@ class searchCtl extends CtlBase {
             });
             });
             return system.getResultList(data.count, data.rows)
             return system.getResultList(data.count, data.rows)
         } catch (e) {
         } catch (e) {
-            console.log("=======================>", e)
+            return system.getResultFail(-1,e);
         }
         }
 
 
     }
     }
 }
 }
-
+function buildtmqueyUrl(path){
+    if (settings.env == "dev") {
+        tmurl += tmtransactionPath
+    }else {
+        tmurl += path
+    }
+}
 module.exports = searchCtl;
 module.exports = searchCtl;