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

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

@@ -7,11 +7,14 @@ class PatentQueryAPI extends WEBBase {
     }
 
     /**
-      * 接口跳转-POST请求
-      * action_type     执行的类型
-      * action_body     执行的参数
-      */
+     * 接口跳转-POST请求
+     * action_type     执行的类型
+     * action_body     执行的参数
+     */
     async springBoard(pobj, qobj, req) {
+        console.log("==================================================");
+        console.log(pobj);
+        console.log("==================================================");
         if (!pobj.actionProcess) {
             return system.getResult(null, "actionProcess参数不能为空");
         }
@@ -25,7 +28,7 @@ class PatentQueryAPI extends WEBBase {
     async opActionProcess(pobj, action_type, req) {
         var opResult = null;
         switch (action_type) {
-            case "test"://测试
+            case "test": //测试
                 opResult = system.getResultSuccess(null, "测试成功");
                 break;
             case "CommomSearchbyApplicant"://根据申请人查询聚合
@@ -39,6 +42,10 @@ class PatentQueryAPI extends WEBBase {
             case "worksCountByAuthor"://根据公司名称得到著作权量
             case "worksListByAuthor"://根据公司名称得到著作权详情
             case "worksDetailsByregNum"://根据登记号获取著作权详情
+            case "CommomSearchbyTitle"://根据标题查询聚合
+            case "CommomSearchbyInventor"://根据发明人查询聚合
+            case "CommomSearchbyFilingno"://根据申请号查询聚合
+            case "CommomSearchbyPubno"://根据公开号查询聚合
                 opResult = await this.patentSve.opReqResult(pobj, req);
                 break;
             default:

center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js

@@ -44,11 +44,11 @@ class UtilsNeedService extends AppServiceBase {
     pobj.actionBody.type = pobj.actionBody.channel_type_code;
     if (pobj.actionBody.channel_type_code == 5) {
       pobj.actionBody.type = "ali.icp";
-    } else  if (pobj.actionBody.channel_type_code == 7){
+    } else if (pobj.actionBody.channel_type_code == 7) {
       pobj.actionBody.type = "ali.edi";
-    } else  if (pobj.actionBody.channel_type_code == "tmjy"){
+    } else if (pobj.actionBody.channel_type_code == "tmjy") {
       pobj.actionBody.type = "ali.tmd";
-    } 
+    }
 
     if (pobj.actionBody.description.indexOf("备#") < 0) {
       pobj.actionBody.level = "A";
@@ -456,9 +456,21 @@ class UtilsNeedService extends AppServiceBase {
         status: "followingUp"
       },
       opType: "updateChanceStatus",
-      appInfo: pobj.appInfo
+      appInfo: pobj.appInfo,
+      userInfo: pobj.userInfo
     }
     self.utilsPushSve.aliBusiness2Delivery(reqParams, "updateChanceStatus");
+    // var reqParams = {
+    //   actionBody: {
+    //     "bizId": pobj.actionBody.intentionBizId,
+    //     "follow_date": (new Date()).toISOString(),
+    //     "follow_content": pobj.actionBody.note
+    //   },
+    //   opType: "updateChanceStatus",
+    //   appInfo: pobj.appInfo,
+    //   userInfo: pobj.userInfo
+    // }
+    // self.utilsPushSve.aliBusiness2Fq(pobj, "pushCloseICPNeed");
     return system.getResultSuccess();
   }
 
@@ -562,43 +574,43 @@ class UtilsNeedService extends AppServiceBase {
     //   return system.getResult(null, "actionBody.userFeedBack can not be empty，100494");
     // }
     pobj.actionBody.data = [];
-    await this.queryByAli(pobj,1);
+    await this.queryByAli(pobj, 1);
     pobj.actionType = "getUnCreated";
     let reqUrl = this.centerOrderUrl + "action/need/springBoard";
     let result = await this.restPostUrl(pobj, reqUrl);
     if (result.status == 0) {
       pobj.actionBody = {
-        type:"tmjy"
+        type: "tmjy"
       };
-      for (let item of result.data){
-        pobj.actionBody.intentionBizId=item.BizId;
-        pobj.actionBody.mobile=item.Mobile?item.Mobile:"";
-        pobj.actionBody.userName=item.UserName?item.UserName:"";
-        pobj.notes=`${item.RegisterNumber?"RegisterNumber:"+item.RegisterNumber:""}${item.Classification?"Classification:"+item.Classification:""}`;
-        let res = await this.submitNeed(JSON.parse(JSON.stringify(pobj)),{intentionBizId:item.BizId});
+      for (let item of result.data) {
+        pobj.actionBody.intentionBizId = item.BizId;
+        pobj.actionBody.mobile = item.Mobile ? item.Mobile : "";
+        pobj.actionBody.userName = item.UserName ? item.UserName : "";
+        pobj.notes = `${item.RegisterNumber ? "RegisterNumber:" + item.RegisterNumber : ""}${item.Classification ? "Classification:" + item.Classification : ""}`;
+        let res = await this.submitNeed(JSON.parse(JSON.stringify(pobj)), { intentionBizId: item.BizId });
         console.log(res)
       }
-        return system.getResultSuccess();
-      }else {
-          return system.getResultFail(result.status,result.msg);
-      }
-    return system.getResultFail(res.status,res.msg);
+      return system.getResultSuccess();
+    } else {
+      return system.getResultFail(result.status, result.msg);
+    }
+    return system.getResultFail(res.status, res.msg);
   }
-  async queryByAli(pobj,page){
+  async queryByAli(pobj, page) {
     let res = await this.aliclient.reqbyget({
-        action: "QueryTradeIntentionUserList", reqbody: {
-            Begin: pobj.actionBody.Begin ? pobj.actionBody.Begin : "",
-            End: pobj.actionBody.End ? pobj.actionBody.End : "",
-            PageNum: page,
-            PageSize: 10,
-        }, apiVersion: "2019-05-08"
+      action: "QueryTradeIntentionUserList", reqbody: {
+        Begin: pobj.actionBody.Begin ? pobj.actionBody.Begin : "",
+        End: pobj.actionBody.End ? pobj.actionBody.End : "",
+        PageNum: page,
+        PageSize: 10,
+      }, apiVersion: "2019-05-08"
     });
     if (res.status == 0) {
-        pobj.actionBody.data.push(...res.data.Data);
-        if (page < res.data.TotalPageNum){
-           await this.queryByAli(pobj,page+1)
-        }
-     }
+      pobj.actionBody.data.push(...res.data.Data);
+      if (page < res.data.TotalPageNum) {
+        await this.queryByAli(pobj, page + 1)
+      }
+    }
   }
 
   // 2020 0914 lin 新增 刷单一条龙功能