tj

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

@@ -113,9 +113,12 @@ class GatewaypushlogService extends ServiceBase {
     if (!pobj.orderNo) {
     if (!pobj.orderNo) {
       return { "message": "orderNo不能为空", "data": {}, "code": -200 };
       return { "message": "orderNo不能为空", "data": {}, "code": -200 };
     }
     }
-    pobj.orderPrice = Number(pobj.orderPrice || "0");
-    if (pobj.orderPrice < 0) {
-      return { "message": "orderPrice不能为空", "data": {}, "code": -200 };
+    if (!pobj.orderPrice) {
+      if (pobj.orderPrice != 0) {
+        return { "message": "orderPrice不能为空", "data": {}, "code": -200 };
+      } else {
+        pobj.orderPrice = "0";
+      }
     }
     }
     if (!pobj.phone) {
     if (!pobj.phone) {
       return { "message": "phone不能为空", "data": {}, "code": -200 };
       return { "message": "phone不能为空", "data": {}, "code": -200 };
@@ -170,18 +173,12 @@ 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;
     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: "submitNeed",//调用参数
       pushActionType: "submitNeed",//调用参数
       pushtimes: 0,//推送次数
       pushtimes: 0,//推送次数
       pushStatus: "wts",//推送状态
       pushStatus: "wts",//推送状态
@@ -208,33 +205,6 @@ class GatewaypushlogService extends ServiceBase {
       requestjson: JSON.stringify(pobj),//请求地址
       requestjson: JSON.stringify(pobj),//请求地址
       pushUrl: "/action/intentionapi/queryOrderState",//调用地址
       pushUrl: "/action/intentionapi/queryOrderState",//调用地址
       pushActionType: "icpFeedbackSubmit",//调用参数
       pushActionType: "icpFeedbackSubmit",//调用参数
->>>>>>> 1631774356a4d0d7696a7ea7626878ed46926858
-      pushtimes: 0,//推送次数
-      pushStatus: "wts",//推送状态
-    }
-    await self.create(param);
-    return self.getResultSuccess(param.requestId);
-  }
-
-<<<<<<< HEAD
-  //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",//调用参数
       pushtimes: 0,//推送次数
       pushtimes: 0,//推送次数
       pushStatus: "wts",//推送状态
       pushStatus: "wts",//推送状态
     }
     }
@@ -242,8 +212,6 @@ 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;
@@ -268,4 +236,4 @@ class GatewaypushlogService extends ServiceBase {
 
 
 
 
 }
 }
-module.exports = GatewaypushlogService;
+module.exports = GatewaypushlogService;
\ No newline at end of file