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

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

@@ -106,6 +106,10 @@ class UtilsNeedService extends AppServiceBase {
     }
     }
     var self = this;
     var self = this;
     pobj.actionType = "receiveIcpFeedback";
     pobj.actionType = "receiveIcpFeedback";
+    if(pobj.actionBody && pobj.actionBody.intentionStatus){
+      pobj.intentionStatus = pobj.actionBody.intentionStatus;
+    }
+    var rtn = await this.execClient.execPost(pobj, url);
     // 2020 0803 lin 修改;
     // 2020 0803 lin 修改;
     if (pobj.intentionStatus) {
     if (pobj.intentionStatus) {
       // 如果需求当前字段为5（已关闭）则通知fq
       // 如果需求当前字段为5（已关闭）则通知fq
@@ -113,7 +117,6 @@ class UtilsNeedService extends AppServiceBase {
         self.utilsPushSve.aliBusiness2Fq(pobj, "pushCloseICPNeed");
         self.utilsPushSve.aliBusiness2Fq(pobj, "pushCloseICPNeed");
       }
       }
     }
     }
-    var rtn = await this.execClient.execPost(pobj, url);
     var data = JSON.parse(rtn.stdout);
     var data = JSON.parse(rtn.stdout);
     return data;
     return data;
   }
   }

center-channel/package.json

@@ -57,6 +57,7 @@
     "sha256": "^0.2.0",
     "sha256": "^0.2.0",
     "socket.io": "^2.1.1",
     "socket.io": "^2.1.1",
     "tenpay": "^2.1.18",
     "tenpay": "^2.1.18",
+    "urlencode": "^1.1.0",
     "uuid": "^3.2.1",
     "uuid": "^3.2.1",
     "wx-pay": "^1.0.2",
     "wx-pay": "^1.0.2",
     "xml2js": "^0.4.23"
     "xml2js": "^0.4.23"