v0.8.0

rej-reex/app/base/controller/impl/rejreex/trademarkcaseCtl.js

@@ -41,5 +41,9 @@ class TrademarkcaseCtl extends CtlBase {
       return system.getResultFail(error.message)
     }
   }
+
+  async pushQfTest(pobj, qobj, req) {
+    return await this.service.pushQf(pobj.id)
+  }
 }
 module.exports = TrademarkcaseCtl;

rej-reex/app/base/db/impl/rejreex/trademarkcaseDao.js

@@ -20,6 +20,10 @@ class TrademarkcaseDao extends Dao {
         break
       case '/myaskfor/pendingservice':
         qw.tradeStatus = '待完善材料'
+        break
+      case '/rejaskmanage/officalManager':
+        qw.offical = { [this.db.Op.ne]: null }
+        break
     }
     qc.raw = true;
     return qw;

rej-reex/app/base/service/impl/rejreex/trademarkcaseSve.js

 const system = require("../../../system");
 const ServiceBase = require("../../sve.base");
+const settings = require('../../../../config/settings')
 class TrademarkcaseService extends ServiceBase {
   constructor() {
     super("rejreex", ServiceBase.getDaoName(TrademarkcaseService))
     this.agentDao = system.getObject("db.rejreex.agentDao")
     this.applicantDao = system.getObject('db.rejreex.applicantDao')
+    this.restClient = system.getObject("util.restClient")
+    this.tkurl = settings.qftkurl()
+    this.qfurl = settings.qifuurl()
   }
 
   async createOrUpdate (params) {
+    console.log(params)
     let isOrder = undefined
     if (params.orderId) {
       isOrder = await this.dao.findOne({ orderId: params.orderId })
     }
     if (isOrder) {
       params.id = isOrder.id
+      // this.pushQf(params.id)
       return await this.dao.update(params)
     } else {
       params.recDate = new Date()
       if (params.id) {
         let statusArr = ["待完善材料", "待审核", "申请递交中"]
-        let dt = await this.dao.findOne({id: params.id})
-        if(statusArr.indexOf(dt.tradeStatus) != -1) {
+        let dt = await this.dao.findOne({ id: params.id })
+        if (statusArr.indexOf(dt.tradeStatus) != -1) {
           params.rejStatus = '待提报'
         }
-        if (params.askforData && params.askforData.rmLicense) {
+        if (params.askForData && params.askForData.rmLicense) {
           if (statusArr.indexOf(dt.tradeStatus) != -1) {
             params.caStatus = "待提报"
           }
@@ -31,17 +37,20 @@ class TrademarkcaseService extends ServiceBase {
         if (params.usccode && params.applicant && params.applicant.applicantName) {
           let sql = ""
           sql = `UPDATE trademarkcase SET applicant=json_set(applicant, '$.applicantName', "${params.applicant.applicantName}"), ${params.tradeType ? `tradeType=${params.tradeType}` : ""}, ${params.usccode ? `usccode="${params.usccode}"` : ""}, ${params.agentName ? `agentName="${params.agentName}"` : ""}, ${params.askforId ? `askforId="${params.askforId}"` : ""} WHERE id = ${params.id};`
+          // this.pushQf(params.id)
           return await this.dao.customExecAddOrPutSql(sql);
         } else {
+          // this.pushQf(params.id)
           return await this.dao.update(params)
         }
       } else {
-        if (params.askforData && params.askforData.rmLicense) {
+        if (params.askForData && params.askForData.rmLicense) {
           params.caStatus = "待提报"
         }
         if (!params.caseId) {
           params.caseId = `CS${new Date().getTime()}ae${Math.floor(Math.random() * 100)}`
         }
+        // this.pushQf(params.orderId, 'od')
         return await this.dao.create(params)
       }
     }
@@ -62,5 +71,63 @@ class TrademarkcaseService extends ServiceBase {
     return await this.dao.findAndCountAll(params)
     // return await this.dao.model.findAndCountAll(query)
   }
+
+  async pushQf (id, tp) {
+    let tmpdata
+    if (tp == 'od') {
+      tmpdata = await this.dao.findOne({ orderId: id })
+    } else {
+      tmpdata = await this.dao.findOne({ id })
+    }
+    let reqdata = this.orgdata(tmpdata)
+
+    let req = {
+      actionType: "getAppTokenByHosts",
+      actionBody: {}
+    }
+    let tkurl = this.tkurl
+    let tokenData = await this.restClient.execPost(req, tkurl)
+    console.log(tokenData)
+    tokenData = JSON.parse(tokenData.stdout)
+    if (tokenData.status == 0) {
+      let token = tokenData.data.token
+      console.log(token)
+      let qfurl = this.qfurl
+      req.actionType = "receiveDeliveryData"
+      req.actionBody = reqdata
+      let res = await this.restClient.execPostWithToken(req, qfurl, token)
+      console.log(res)
+      return res
+    } else {
+      return "--"
+    }
+  }
+
+  orgdata (data) {
+    let datat = {}
+    datat.orderNo = data.orderId
+    let apply = {
+      askforId: data.askforId,
+      tradeImg: data.tradeImg,
+      tradeType: data.tradeType,
+      applicantName: data.v_applicantName,
+      usccode: data.usccode,
+      agentname: data.agentName
+    }
+    datat.apply = apply
+    datat.applyUser = data.applicant
+    datat.applyUser.usccode = data.usccode
+
+    datat.trademarkRejInfo = data.trademarkRejInfo
+
+    datat.askForData = data.askForData
+
+    datat.deliveryStatusName = data.tradeStatus
+
+    datat.supData = data.supData
+    datat.recDate = data.recDate
+    datat.askforDate = data.askforDate
+    return datat
+  }
 }
 module.exports = TrademarkcaseService;

rej-reex/app/config/settings.js

@@ -25,6 +25,20 @@ var settings = {
       return ENVINPUT.KONG_ADMIAN;
     }
   },
+  qifuurl: function () {
+    if (this.env == 'dev') {
+      return 'http://gsbweb.qifu-dev.gongsibao.com:4012/web/opaction/tmReview/springBoard'
+    } else {
+      return 'http://gsbweb.qifu.gongsibao.com/web/opaction/tmReview/springBoard'
+    }
+  },
+  qftkurl: function () {
+    if (this.env == 'dev') {
+      return 'http://gsbweb.qifu-dev.gongsibao.com:4012/web/auth/accessAuth/getAppTokenByHosts'
+    } else {
+      return 'http://gsbweb.qifu.gongsibao.com/web/auth/accessAuth/getAppTokenByHosts'
+    }
+  },
   receiveUrl: function () {
     if (this.env == "dev") {
       return "http://192.168.1.140:4011/api/receive/entService/springBoard";