wdy

center-order/app/base/api/impl/action/icapi.js

@@ -46,7 +46,7 @@ class IcAPI extends APIBase {
                 opResult = await this.needsolutionSve.getProgrammeInfoByNeedNo(pobj);
                 opResult = await this.needsolutionSve.getProgrammeInfoByNeedNo(pobj);
                 break;
                 break;
             case "receiveFeedback"://接收方案反馈信息(即方案作废)
             case "receiveFeedback"://接收方案反馈信息(即方案作废)
-                opResult = await this.needsolutionSve.receiveFeedback(pobj);
+                opResult = await this.needsolutionSve.receiveFeedback(pobj, req);
                 break;
                 break;
             case "abolishProgramme"://服务商方案作废
             case "abolishProgramme"://服务商方案作废
                 opResult = await this.needsolutionSve.abolishProgramme(pobj);
                 opResult = await this.needsolutionSve.abolishProgramme(pobj);

center-order/app/base/service/impl/dbneed/needinfoSve.js

@@ -49,13 +49,28 @@ class NeedinfoService extends ServiceBase {
   async submitNeed(pobj, actionBody, req) {
   async submitNeed(pobj, actionBody, req) {
     var needNo = await this.getBusUid("n");
     var needNo = await this.getBusUid("n");
     if (!actionBody.intentionBizId) {
     if (!actionBody.intentionBizId) {
-      return system.getResult(null, "intentionBizId不能为空");
+      return {
+        "requestId": req.requestId,
+        "success": false,
+        "errorMsg": "intentionBizId不能为空",
+        "errorCode": "ok"
+      };
     }
     }
     if (!actionBody.mobile) {
     if (!actionBody.mobile) {
-      return system.getResult(null, "mobile不能为空");
+      return {
+        "requestId": req.requestId,
+        "success": false,
+        "errorMsg": "mobile不能为空",
+        "errorCode": "ok"
+      };
     }
     }
     if (!actionBody.type) {
     if (!actionBody.type) {
-      return system.getResult(null, "type不能为空");
+      return {
+        "requestId": req.requestId,
+        "success": false,
+        "errorMsg": "type不能为空",
+        "errorCode": "ok"
+      };
     }
     }
     var ninfo = await this.findOne({ channelNeedNo: actionBody.intentionBizId });
     var ninfo = await this.findOne({ channelNeedNo: actionBody.intentionBizId });
     if (ninfo) {
     if (ninfo) {

center-order/app/base/service/impl/dbneed/needsolutionSve.js

@@ -267,19 +267,34 @@ class NeedsolutionService extends ServiceBase {
 
 
   }
   }
   //接收方案反馈信息(即方案作废)
   //接收方案反馈信息(即方案作废)
-  async receiveFeedback(pobj){
+  async receiveFeedback(pobj,req){
     var ab = pobj.actionBody;
     var ab = pobj.actionBody;
     if(!ab.solutionBizId){
     if(!ab.solutionBizId){
-      return system.getResultFail(-101,"方案业务编号不能为空");
+      return {
+        "requestId": req.requestId,
+        "success": false,
+        "errorMsg": "-101,方案业务编号不能为空",
+        "errorCode": "ok"
+      };
     }
     }
     if(!ab.operateType){
     if(!ab.operateType){
-      return system.getResultFail(-102,"操作类型不能为空");
+      return {
+        "requestId": req.requestId,
+        "success": false,
+        "errorMsg": "-102,操作类型不能为空",
+        "errorCode": "ok"
+      };
     }
     }
     var ns = await this.dao.model.findOne({
     var ns = await this.dao.model.findOne({
       where:{channelSolutionNo:ab.solutionBizId},raw:true
       where:{channelSolutionNo:ab.solutionBizId},raw:true
     });
     });
     if(!ns || !ns.id){
     if(!ns || !ns.id){
-      return system.getResultFail(-103,"未知方案");
+      return {
+        "requestId": req.requestId,
+        "success": false,
+        "errorMsg": "-103,未知方案",
+        "errorCode": "ok"
+      };
     }
     }
     var solutionContent = ns.solutionContent?JSON.parse(ns.solutionContent):"";
     var solutionContent = ns.solutionContent?JSON.parse(ns.solutionContent):"";
     var status = "";
     var status = "";
@@ -290,7 +305,12 @@ class NeedsolutionService extends ServiceBase {
     }else if(ab.operateType=="PAID"){// PAID：支付
     }else if(ab.operateType=="PAID"){// PAID：支付
       status="ywc";
       status="ywc";
     }else{
     }else{
-      return system.getResultFail(-104,"操作类型有误");
+      return {
+        "requestId": req.requestId,
+        "success": false,
+        "errorMsg": "-104,操作类型有误",
+        "errorCode": "ok"
+      };
     }
     }
     var solution_status={"dqr":"待确认","ywc":"已完成","yzf":"已作废"};
     var solution_status={"dqr":"待确认","ywc":"已完成","yzf":"已作废"};
     solutionContent["deliveryStatus"] = status;
     solutionContent["deliveryStatus"] = status;
@@ -304,7 +324,12 @@ class NeedsolutionService extends ServiceBase {
       status:status,solutionContent:solutionContent
       status:status,solutionContent:solutionContent
     };
     };
     await this.dao.model.update(reqObj, { where: { id: ns.id }});//修改方案信息
     await this.dao.model.update(reqObj, { where: { id: ns.id }});//修改方案信息
-    return system.getResultSuccess();
+    return {
+      "requestId": req.requestId,
+      "success": true,
+      "errorMsg": "",
+      "errorCode": "ok"
+    };;
   }
   }
   //服务商方案作废
   //服务商方案作废
   async abolishProgramme(pobj){
   async abolishProgramme(pobj){