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

center-order/app/base/service/impl/dbcorder/orderinfoSve.js

@@ -1761,6 +1761,12 @@ class OrderInfoService extends ServiceBase {
         }//增加流程状态列表数据
 
         try {
+            //商标状态推送 360
+            if (orderItem.uapp_id == 50) {
+                actionBody.deliveryInfo = deliveryInfo;
+                this.push360Sve.pushTmStatus(actionBody);
+                this.push360Sve.sendMessage(actionBody)
+            }
             await self.db.transaction(async function (t) {
                 if (Object.keys(updateOrderFields).length > 0) {
                     self.updateByWhere(updateOrderFields, {where: {orderNo: actionBody.orderNo}}, t);
@@ -1778,13 +1784,6 @@ class OrderInfoService extends ServiceBase {
             }//更新商标官文
             deliveryInfo.opNotes = actionBody.opNotes || "";
             this.putOrderDelivery(deliveryInfo, actionBody.orderNo);
-
-            //商标状态推送 360
-            if (orderItem.uapp_id == 50) {
-                actionBody.deliveryInfo = deliveryInfo;
-                this.push360Sve.pushTmStatus(actionBody);
-                this.push360Sve.sendMessage(actionBody)
-            }
         } catch (error) {
             console.log("error------------------------", e.stack);
         }

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

@@ -41,13 +41,26 @@ class ExecClient {
         console.log(cmd);
         return cmd;
     }
-    Fetch360TokenCmd(subData,url){
+    Fetch360TokenCmd(subData, url) {
         let cmd = this.cmd360Token.replace(
             /\{data\}/g, subData).replace(/\{url\}/g, url);
         console.log(cmd);
         return cmd;
     }
     async execPost(subData, url) {
+        //本机windows curl json格式
+        // if (settings.env == 'dev') {
+        //     const rs = await axios.post(url, subData, {
+        //         auth: {
+        //             username: "admines",
+        //             password: "adminGSBes"
+        //         }
+        //     });
+        //     const ret = {
+        //         stdout: JSON.stringify(rs.data)
+        //     }
+        //     return ret;
+        // }
         let cmd = this.FetchPostCmd(subData, url);
         var result = await this.exec(cmd);
         return result;
@@ -62,9 +75,9 @@ class ExecClient {
         var result = await this.exec2(cmd);
         return result;
     }
-    async exec360GetToken(url){
+    async exec360GetToken(url) {
         const qs = require('qs')
-        let obj = {"scope":"smart_business","grant_type":"client_credentials"}
+        let obj = { "scope": "smart_business", "grant_type": "client_credentials" }
         // if(settings.env == 'dev'){
         //     const rs = await axios({
         //         method: 'post',
@@ -80,7 +93,7 @@ class ExecClient {
         //     }
         //     return ret;
         // }
-        let cmd = this.Fetch360TokenCmd(qs.stringify(obj),url);
+        let cmd = this.Fetch360TokenCmd(qs.stringify(obj), url);
         console.log(cmd);
         var result = await this.exec(cmd);
         return result;