tj

igirl-channel-gateway/app/base/service/impl/common/gatewaypushlogSve.js

@@ -170,12 +170,45 @@ class GatewaypushlogService extends ServiceBase {
       return self.getResultFail("consultType不能为空");
       return self.getResultFail("consultType不能为空");
     }
     }
     pobj.type = pobj.consultType;
     pobj.type = pobj.consultType;
+<<<<<<< HEAD
+=======
+    pobj.mobile = pobj.phone;
+>>>>>>> 1631774356a4d0d7696a7ea7626878ed46926858
     var param = {
     var param = {
       requestId: self.getUUID(),
       requestId: self.getUUID(),
       requestUrl: "/api/ali/tm/consultation/submit",
       requestUrl: "/api/ali/tm/consultation/submit",
       requestjson: JSON.stringify(pobj),//请求地址
       requestjson: JSON.stringify(pobj),//请求地址
       pushUrl: "/action/intentionapi/queryOrderState",//调用地址
       pushUrl: "/action/intentionapi/queryOrderState",//调用地址
+<<<<<<< HEAD
       pushActionType: "icpSubmitNeed",//调用参数
       pushActionType: "icpSubmitNeed",//调用参数
+=======
+      pushActionType: "submitNeed",//调用参数
+      pushtimes: 0,//推送次数
+      pushStatus: "wts",//推送状态
+    }
+    await self.create(param);
+    return self.getResultSuccess(param.requestId);
+  }
+
+  //icp需求反馈
+  async icpFeedbackSubmit(pobj) {
+    var self = this;
+    if (!pobj.intentionBizId) {
+      return self.getResultFail("intentionBizId不能为空");
+    }
+    if (!pobj.description) {
+      return self.getResultFail("description不能为空");
+    }
+    if (!pobj.intentionStatus) {
+      return self.getResultFail("intentionStatus不能为空");
+    }
+    var param = {
+      requestId: self.getUUID(),
+      requestUrl: "/api/ali/tm/feedback/submit",
+      requestjson: JSON.stringify(pobj),//请求地址
+      pushUrl: "/action/intentionapi/queryOrderState",//调用地址
+      pushActionType: "icpFeedbackSubmit",//调用参数
+>>>>>>> 1631774356a4d0d7696a7ea7626878ed46926858
       pushtimes: 0,//推送次数
       pushtimes: 0,//推送次数
       pushStatus: "wts",//推送状态
       pushStatus: "wts",//推送状态
     }
     }
@@ -183,6 +216,7 @@ class GatewaypushlogService extends ServiceBase {
     return self.getResultSuccess(param.requestId);
     return self.getResultSuccess(param.requestId);
   }
   }
 
 
+<<<<<<< HEAD
   //icp需求反馈
   //icp需求反馈
   async icpFeedbackSubmit(pobj) {
   async icpFeedbackSubmit(pobj) {
     var self = this;
     var self = this;
@@ -208,6 +242,8 @@ class GatewaypushlogService extends ServiceBase {
     return self.getResultSuccess(param.requestId);
     return self.getResultSuccess(param.requestId);
   }
   }
 
 
+=======
+>>>>>>> 1631774356a4d0d7696a7ea7626878ed46926858
   //icp状态变更
   //icp状态变更
   async icpNotify(pobj) {
   async icpNotify(pobj) {
     var self = this;
     var self = this;

igirl-channel-gateway/app/config/routes/api.js

@@ -273,7 +273,11 @@ module.exports = function (app) {
 				await logCtl.applicationOctetStream2Json(req);
 				await logCtl.applicationOctetStream2Json(req);
 			}
 			}
 			var client_ip = system.get_client_ip(req);
 			var client_ip = system.get_client_ip(req);
+<<<<<<< HEAD
 			req.body.action_type = "icpSubmitNeed";
 			req.body.action_type = "icpSubmitNeed";
+=======
+			req.body.action_type = "submitNeed";
+>>>>>>> 1631774356a4d0d7696a7ea7626878ed46926858
 			var result = await gatewaypushlogSve.icpSubmitNeed(req.body, client_ip);
 			var result = await gatewaypushlogSve.icpSubmitNeed(req.body, client_ip);
 			logCtl.info({
 			logCtl.info({
 				optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "回调处理订单结果：，method=" + req.body.trxcode,
 				optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "回调处理订单结果：，method=" + req.body.trxcode,