fix

rej-reex/app/base/api/impl/reportcb/cagentcb.js

@@ -9,6 +9,7 @@ class RejAPI extends APIBase {
 
 
   async getRejDataCb (pobj, q, req) {
   async getRejDataCb (pobj, q, req) {
     try {
     try {
+      let a = 'TESTAGENTCB'
       let result = await this.cagentcbSve.getRejData();
       let result = await this.cagentcbSve.getRejData();
       if (result.count) {
       if (result.count) {
         result.code = 200
         result.code = 200

rej-reex/app/base/api/impl/reportcb/rejcb.js

@@ -19,7 +19,7 @@ class RejAPI extends APIBase {
       }
       }
       return result
       return result
     } catch (error) {
     } catch (error) {
-      console.log(error.message)
+      console.log(error)
       return {
       return {
         code: -1,
         code: -1,
         msg: error.message
         msg: error.message
@@ -82,6 +82,14 @@ class RejAPI extends APIBase {
     }
     }
   }
   }
 
 
+  async initTruthData() {
+    try {
+      return await this.rejcbSve.initTruthData()
+    } catch (error) {
+      console.log(error)
+    }
+  }
+
   classDesc () {
   classDesc () {
     return {
     return {
       groupName: "auth",
       groupName: "auth",

rej-reex/app/base/service/impl/reportcb/rejcbSve.js

 const system = require("../../../system");
 const system = require("../../../system");
+const settings = require('../../../../config/settings')
 const ServiceBase = require("../../sve.base");
 const ServiceBase = require("../../sve.base");
 class RejcbService extends ServiceBase {
 class RejcbService extends ServiceBase {
-  constructor() {
+  constructor () {
     super()
     super()
     this.tcDao = system.getObject('db.rejreex.trademarkcaseDao')
     this.tcDao = system.getObject('db.rejreex.trademarkcaseDao')
     this.bcDao = system.getObject('db.common.bcdataDao')
     this.bcDao = system.getObject('db.common.bcdataDao')
     this.restClient = system.getObject("util.restClient")
     this.restClient = system.getObject("util.restClient")
+    this.tkurl = settings.qftkurl()
+    this.qfurl = settings.qifuurl()
+    this.qftmurl = settings.qftmurl()
     this.isTest = true
     this.isTest = true
   }
   }
 
 
@@ -124,7 +128,7 @@ class RejcbService extends ServiceBase {
         step3.evidenceCatalogName = tmpeviDirArr[tmpeviDirArr.length - 1]
         step3.evidenceCatalogName = tmpeviDirArr[tmpeviDirArr.length - 1]
       }
       }
       step3.evidenceName = ""
       step3.evidenceName = ""
-      step3.evidenceUrl =  data[i].askForData.evidenceCon ? data[i].askForData.evidenceCon : ""
+      step3.evidenceUrl = data[i].askForData.evidenceCon ? data[i].askForData.evidenceCon : ""
       if (step3.evidenceUrl) {
       if (step3.evidenceUrl) {
         let tmpeviArr = step3.evidenceUrl.split('/')
         let tmpeviArr = step3.evidenceUrl.split('/')
         step3.evidenceName = tmpeviArr[tmpeviArr.length - 1]
         step3.evidenceName = tmpeviArr[tmpeviArr.length - 1]
@@ -160,12 +164,12 @@ class RejcbService extends ServiceBase {
   }
   }
 
 
   // 保存商标局提交数据
   // 保存商标局提交数据
-  async saveBcData(data) {
+  async saveBcData (data) {
     let param = {
     let param = {
-      data:JSON.stringify(data),
+      data: JSON.stringify(data),
       type: "驳回复审"
       type: "驳回复审"
     }
     }
-   await this.bcDao.create(param)
+    await this.bcDao.create(param)
   }
   }
 
 
   // 初始化状态
   // 初始化状态
@@ -173,9 +177,52 @@ class RejcbService extends ServiceBase {
     return await this.tcDao.model.update({ rejStatus: "待提报" }, { where: { caseId: { [this.db.Op.like]: `%TESTCB%` } } })
     return await this.tcDao.model.update({ rejStatus: "待提报" }, { where: { caseId: { [this.db.Op.like]: `%TESTCB%` } } })
   }
   }
 
 
+  async initTruthData () {
+    let queryData = await this.tcDao.model.findAll({
+      where: {
+        caseId: { [this.db.Op.like]: `%TESTCB%` },
+        tradeStatus: "商标局处理中",
+        rejStatus: "待提报",
+        caStatus: { [this.db.Op.in]: ["无变更"] }
+      },
+      attributes: ['id', 'askforId']
+    })
+    let req = {
+      actionType: "getAppTokenByHosts",
+      actionBody: {}
+    }
+    let tokenData = await this.restClient.execPost(req, this.tkurl)
+    console.log(tokenData)
+    tokenData = JSON.parse(tokenData.stdout)
+    let token = tokenData.data.token
+    for (let i = 0; i < res.data.detaildata.length; ++i) {
+      req = {
+        "actionType": "tradeMarkDetail",
+        "actionBody": {
+          "sbzch": queryData[i].askforId
+        }
+      }
+      let res = await this.restClient.execPostWithToken(req, this.qftmurl, token)
+      res = JSON.parse(res.stdout)
+      let company = res.data.detaildata[0].zcr
+      req = {
+        "actionType": "getCompanyInfoNoUser",
+        "actionBody": {
+          "company_name": company
+        }
+      }
+      res = await this.restClient.execPostWithToken(req, this.qftmurl, token)
+      res = JSON.parse(res.stdout)
+      let usccode = res.data.creditCode
+      await this.tcDao.update({ usccode }, { where: { id: queryData[i].id } })
+    }
+
+    return JSON.parse(res.stdout)
+  }
+
   async checkurl (url) {
   async checkurl (url) {
     let res = await this.restClient.execGet(null, url)
     let res = await this.restClient.execGet(null, url)
-    if (res.status){
+    if (res.status) {
       return false
       return false
     } else {
     } else {
       return true
       return true

rej-reex/app/config/settings.js

@@ -33,6 +33,14 @@ var settings = {
       return 'http://gsbweb.qifu.gongsibao.com/web/opaction/tmReview/springBoard'
       return 'http://gsbweb.qifu.gongsibao.com/web/opaction/tmReview/springBoard'
     }
     }
   },
   },
+  qftmurl: function () {
+    if (this.env == 'dev') {
+      return 'http://gsbweb.qifu-dev.gongsibao.com/web/action/tmQuery/springBoard'
+      // return 'http://gsbweb.qifu-dev.gongsibao.com:4012/web/opaction/tmReview/springBoard'
+    } else {
+      return 'http://gsbweb.qifu.gongsibao.com/web/action/tmQuery/springBoard'
+    }
+  },
   qftkurl: function () {
   qftkurl: function () {
     if (this.env == 'dev') {
     if (this.env == 'dev') {
       return 'http://gsbweb.qifu-dev.gongsibao.com/web/auth/accessAuth/getAppTokenByHosts'
       return 'http://gsbweb.qifu-dev.gongsibao.com/web/auth/accessAuth/getAppTokenByHosts'