gyq

center-manage/app/base/service/impl/common/channelhandlers/tx.js

@@ -533,13 +533,13 @@ class TxHandler {
       var params = {
         "actionType": "produceData",
         "actionBody": {
-          "pushUrl": this.bookUrl + "/deliverybillCtl",
+          "pushUrl": this.bookUrl + "/deliverybillCtl/insertInfo",
           "actionType": "insertInfo",
           "identifyCode": "book-manage",
           "messageBody": datajson,
           "headData": {
-            'Authorization': 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJvcnpaWmhXRXBKNVVFZzRZUU5uUmlyVEJXa1FQbnZ6UyIsImlhdCI6MTU5MjcwOTYzNn0.TWk_F6Tz3fRMqspoG24VSt5RiC4ldFembFYcLcAbowE',
-            'XAPPKEY': '647a68c9-da01-40d3-9763-1ffa0f64cf3f'
+            'Authorization': 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTg0MzQ2ODcsImlzcyI6InJFRVN6TU5ZUlM2RnBWNnZlY09vdExPNWdPcUNXSmFQIiwiaWF0IjoxNTk4NDMxMDg3fQ.isQ40HqHHfJ-rTsUQOhRIdu4XCitZU-AfzeqSH4kPbQ',
+            'XAPPKEY': 'f6b59b74-f943-4735-bb86-e05d6b7fd78e'
           }
         }
       }
@@ -572,42 +572,72 @@ class TxHandler {
       }
     }
   }
-  async createLeads(datajson) {//财税需求处理
+  async ServiceUpdate(datajson) { //更新服务信息到队列
     try {
-
       var rc = system.getObject("util.execClient");
-      var requrl = this.bookUrl + "/deliverybillCtl/insertInfo";//这个地方要改
-      var params = datajson;
-      var rtn = await rc.execPost3(params, requrl);
+      var requrl = this.queueUrl;
+      var params = {
+        "actionType": "produceData",
+        "actionBody": {
+          "pushUrl": this.bookUrl + "/deliverybillCtl/updateServer",
+          "actionType": "updateServer",
+          "identifyCode": "book-manage",
+          "messageBody": datajson,
+          "headData": {
+            'Authorization': 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTg0MzQ2ODcsImlzcyI6InJFRVN6TU5ZUlM2RnBWNnZlY09vdExPNWdPcUNXSmFQIiwiaWF0IjoxNTk4NDMxMDg3fQ.isQ40HqHHfJ-rTsUQOhRIdu4XCitZU-AfzeqSH4kPbQ',
+            'XAPPKEY': 'f6b59b74-f943-4735-bb86-e05d6b7fd78e'
+          }
+        }
+      }
+      var rtn = await rc.execPost(params, requrl);
       var j = JSON.parse(rtn.stdout);
-      console.log(JSON.stringify(j), "RRRRRRRRRRRRRRR");
-      return rtn;
-    }
-    catch (error) {
-      return system.getResultError(error);
+      if (j.status == 1) {
+        return {
+          "requestId": datajson.requestId,
+          "success": true,
+          "errorCode": 0,
+          "errorMsg": "ok",
+          "data": null
+        }
+      } else {
+        return {
+          "requestId": datajson.requestId,
+          "success": false,
+          "errorCode": -1,
+          "errorMsg": rtn.stderr,
+          "data": null
+        }
+      }
+    } catch (error) {
+      return {
+        "requestId": datajson.requestId,
+        "success": false,
+        "errorCode": -1,
+        "errorMsg": error,
+        "data": null
+      }
     }
-
   }
 }
 
 module.exports = new TxHandler();
 
-(async () => {
-  var task = new TxHandler();
-  var obj = {
-    "requestId": "825da0a74432-738f-4bed-b48d-d51aa808",
-    "bizId": "5892748825678",
-    "contactsPhone": "18510669321",
-    "userId": "10973452443103825",
-    "orderId": "341184456620456778sdggg",
-    "areatype": "city",
-    "area": "100010",
-    "topOrgCode": "rong_yi_suan",
-    "taxpayerType": 1
-  }
-  var d = await task.createLeads(obj);
-  console.log("ddddddddddddd");
-  console.log(JSON.stringify(d));
-  console.log("dddddddddddddd");
-})()
+// (async () => {
+//   var task = new TxHandler();
+//   var obj = {
+//     "requestId": "825da0a74432-738f-4bed-b48d-d51aa808",
+//     "bizId": "5892748825678",
+//     "contactsPhone": "18510669321",
+//     "userId": "10973452443103825",
+//     "orderId": "341184456620456778900",
+//     "areatype": "city",
+//     "area": "100010",
+//     "topOrgCode": "rong_yi_suan",
+//     "taxpayerType": 1
+//   }
+//   var d = await task.ServiceCreate(obj);
+//   console.log("ddddddddddddd");
+//   console.log(JSON.stringify(d));
+//   console.log("dddddddddddddd");
+// })()
 

center-manage/app/base/utils/execClient.js

@@ -6,7 +6,8 @@ class ExecClient {
     constructor() {
         this.cmdPostPattern = "curl -k -H 'Content-type: application/json'  -d '{data}' {url}";
         this.cmdGetPattern = "curl -G -X GET '{url}'";
-        this.cmdPostPattern3 = "curl -k -H 'Content-type: application/json'  -H 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJvcnpaWmhXRXBKNVVFZzRZUU5uUmlyVEJXa1FQbnZ6UyIsImlhdCI6MTU5MjcwOTYzNn0.TWk_F6Tz3fRMqspoG24VSt5RiC4ldFembFYcLcAbowE'  -H 'XAPPKEY: 647a68c9-da01-40d3-9763-1ffa0f64cf3f' -d '{data}' {url}";
+        this.cmdPostPattern3 = "curl -k -H 'Content-type: application/json'  -H 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTg0MzQ2ODcsImlzcyI6InJFRVN6TU5ZUlM2RnBWNnZlY09vdExPNWdPcUNXSmFQIiwiaWF0IjoxNTk4NDMxMDg3fQ.isQ40HqHHfJ-rTsUQOhRIdu4XCitZU-AfzeqSH4kPbQ'  -H 'XAPPKEY: f6b59b74-f943-4735-bb86-e05d6b7fd78e' -d '{data}' {url}";
+        //this.cmdPostPattern3 = "curl -k -H 'Content-type: application/json'  -H 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJvcnpaWmhXRXBKNVVFZzRZUU5uUmlyVEJXa1FQbnZ6UyIsImlhdCI6MTU5MjcwOTYzNn0.TWk_F6Tz3fRMqspoG24VSt5RiC4ldFembFYcLcAbowE'  -H 'XAPPKEY: 647a68c9-da01-40d3-9763-1ffa0f64cf3f' -d '{data}' {url}";
     }
 
     async exec(cmd) {