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

babff4c4 · 宋毅 · 9f81e528 · 2727fda5 · babff4c4 · babff4c4
Commit babff4c4 authored Mar 04, 2021 by 宋毅
7 changed files
--- a/center-channel/app/base/api/impl/auth/taskapi.js
+++ b/center-channel/app/base/api/impl/auth/taskapi.js
@@ -11,6 +11,7 @@ class AccessAuthAPI extends APIBase {
        this.utilsTmAliyunSve = system.getObject("service.utilsSve.utilsTmAliyunSve");
        this.utilsTmOrderCallService = system.getObject("service.utilsSve.utilsTmOrderCallSve");
        this.utilsNeedSve = system.getObject("service.utilsSve.utilsNeedSve");
+        this.utilsOpOrderSve = system.getObject("service.utilsSve.utilsOpOrderSve");
    }
    async QueryTradeIntentionUserList(pobj, qobj, req) {
      pobj.appInfo={uapp_id:18}
@@ -116,10 +117,29 @@ class AccessAuthAPI extends APIBase {
        return system.getResultSuccess();
    }
+    /**
+     * 需求商机同步任务
+     * @param pobj
+     * @param qobj
+     * @param req
+     * @returns {Promise<{msg: *, data, bizmsg: (*|string), status: number}>}
+     */
    async taskSyncNeedBusiness(pobj,qobj,req){
        let result = await this.utilsNeedSve.syncNeedBusiness();
        return result;
    }
+    /**
+     * 订单商机同步任务
+     * @param pobj
+     * @param qobj
+     * @param req
+     * @returns {Promise<{msg: *, data, bizmsg: (*|string), status: number}>}
+     */
+    async taskSyncOrderBusiness(pobj,qobj,req){
+        let result = await this.utilsOpOrderSve.syncOrderBusiness();
+        return result;
+    }
 }
 module.exports = AccessAuthAPI;
\ No newline at end of file
--- a/center-channel/app/base/service/impl/common/gatewaypushlogSve.js
+++ b/center-channel/app/base/service/impl/common/gatewaypushlogSve.js
@@ -28,7 +28,12 @@ class GatewaypushlogService extends ServiceBase {
          }
          var url = settings.gatewayUrl() + "action/intentionapi/springBoard";
          var rtn = await self.execClient.execPost(requestdata, url);
-          var data = JSON.parse(rtn.stdout);
+          var data = rtn
+          try {
+            data = JSON.parse(rtn.stdout);
+          }catch (e) {
+            console.error(e)
+          }
          if (data.success) {
            icloginfo.pushStatus = "yts";
          } else {
@@ -45,7 +50,7 @@ class GatewaypushlogService extends ServiceBase {
      return system.getResultSuccess();
    } catch (error) {
-      this.dingClient.gatewayPushError({message:"Exception",api:"center-channel/taskAliIcapi"})
+      this.dingClient.gatewayPushError({message:"Exception",api:"center-channel/taskAliIcapi",error})
      return system.getResultFail(-1,error);
    }
  }

--- a/center-channel/app/base/service/impl/trademark/icbcSve.js
+++ b/center-channel/app/base/service/impl/trademark/icbcSve.js
@@ -75,10 +75,10 @@ class IcbcService extends AppServiceBase {
        if (!queryobj.companyName) {
            return system.getResultFail(-1, 'companyName can not be empty');
        }
-        var hashValue = await this.restClient.hget(this.searchCertificationData, queryobj.companyName);
+        // var hashValue = await this.restClient.hget(this.searchCertificationData, queryobj.companyName);
-        if (hashValue) {
+        // if (hashValue) {
-            return system.getResultSuccess(JSON.parse(hashValue));
+        //     return system.getResultSuccess(JSON.parse(hashValue));
-        }
+        // }
        //获取token
        let url = settings.icNameUrl() + 'openPlatform/platform/getToken';
        let params = {
@@ -112,9 +112,9 @@ class IcbcService extends AppServiceBase {
            return system.getResult(null, "restPostWithHAuthorizationUrl data is empty");
        };
        let tmArray = [];
-        if (tmrtn.status == 1 && tmrtn.data) {
+        var tmResult = JSON.parse(tmrtn.stdout);
-            var tmResult = JSON.parse(tmrtn.data);
+        if (tmResult.status == 1 && tmResult.data) {
-            tmArray = this.utilsResultSve.formulaContinued(tmResult);
+            tmArray = this.utilsResultSve.formulaContinued(tmResult.data);
        }
        var result = JSON.parse(rtn.stdout);
@@ -129,13 +129,13 @@ class IcbcService extends AppServiceBase {
        //对结果处理
        // "Tag": 1为qichacha,0为gsb
        var setValue = {};
-        setValue[queryobj.companyName] = JSON.stringify(item);
+        // setValue[queryobj.companyName] = JSON.stringify(item);
-        setValue[tm] = JSON.stringify(tmArray);
+        // setValue["trademarks"] = JSON.stringify(tmArray);
        // if (result.Tag == 1) {
        //   this.restClient.hmset(this.disposeCertificationData, setValue);
        // }
        this.restClient.hmset(this.searchCertificationData, setValue);
-        return system.getResult(item);
+        return system.getResult({ "certificates": item, "trademarks": tmArray });
    }

--- a/center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js
+++ b/center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js
@@ -1610,7 +1610,7 @@ class UtilsNeedService extends AppServiceBase {
   */
  async syncNeedBusiness(pobj,qobj,req){
    let url = this.centerOrderUrl + 'task/taskAction/taskNeed';
-    let data = {identifyCode : 'sync'}
+    let data = {identifyCode : 'syncNeed'}
    let result = await this.execPostByTimeOut(req,data,url,"json",null,60)
    if (!result || result.status != 0) {
      return system.getResult(null, result.msg);

--- a/center-channel/app/base/service/impl/utilsSve/utilsOpOrderSve.js
+++ b/center-channel/app/base/service/impl/utilsSve/utilsOpOrderSve.js
@@ -115,5 +115,25 @@ class UtilsOpOrderService extends AppServiceBase {
      }
    }
  }
+  /**
+   * 同步订单商机
+   * @param pobj
+   * @param qobj
+   * @param req
+   * @returns {Promise<{msg: *, data, bizmsg: *|string, status: number}>}
+   */
+  async syncOrderBusiness(pobj,qobj,req){
+    let url = this.centerOrderUrl + 'task/taskAction/taskOrder';
+    let data = {identifyCode : 'syncOrder'}
+    let result = await this.execPostByTimeOut(req,data,url,"json",null,60)
+    if (!result || result.status != 0) {
+      return system.getResult(null, result.msg);
+    }
+    if (!result.data || result.data.status != 0) {
+      return system.getResult(null, result.data.msg);
+    }
+    return system.getResult(result.data.data);
+  }
 }
 module.exports = UtilsOpOrderService;
--- a/center-channel/app/base/service/impl/utilsSve/utilsResultSve.js
+++ b/center-channel/app/base/service/impl/utilsSve/utilsResultSve.js
@@ -24,13 +24,17 @@ class utilsTlBankSve extends AppServiceBase {
        for (let i = 0; i < tms.length; i++) {
            let tmInfo = tms[i];
-            if (!tmInfo.REGDATE) { //注册公告日期
+            let tm_expiry = '';
+            if (!tmInfo.MARKNAME) { //REGDATE注册公告日期
                continue;
            }
-            let zcrqFormat = new Date(tmInfo.REGDATE * 1000); //注册日期
+            if (tmInfo.REGDATE) {
-            zcrqFormat.setFullYear(zcrqFormat.getFullYear() + 10); //专用起始日期计算
+                let zcrqFormat = new Date(tmInfo.REGDATE * 1000); //注册日期
-            zcrqFormat.setMonth(zcrqFormat.getMonth()); //专用起始日期计算
+                zcrqFormat.setFullYear(zcrqFormat.getFullYear() + 10); //专用起始日期计算
-            zcrqFormat.setDate(zcrqFormat.getDate()); //专用起始日期计算
+                zcrqFormat.setMonth(zcrqFormat.getMonth()); //专用起始日期计算
+                zcrqFormat.setDate(zcrqFormat.getDate()); //专用起始日期计算
+                tm_expiry = this.convertDate(zcrqFormat); //计算商标到期日
+            }
            let tmObject = {
                "tm_comName": tmInfo.AGENTNAME, //代理机构
@@ -38,7 +42,7 @@ class utilsTlBankSve extends AppServiceBase {
                "tm_name": tmInfo.MARKNAME, //商标名称
                "tm_appDate": tmInfo.APPDATE, //申请日期
                "tm_isInvalid": tmInfo.ISINVALID, //状态
-                "tm_expiry": this.convertDate(zcrqFormat) //商标到期日
+                "tm_expiry": tm_expiry //商标到期日
            }
            result.push(tmObject);
        }

--- a/center-channel/app/base/system.js
+++ b/center-channel/app/base/system.js