laolan

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

@@ -34,9 +34,9 @@ class RegAPI extends APIBase {
             case "regReceiveSolutionPayInfo"://接收reg方案状态及支付信息(方案支付后创建订单时调用)
                 opResult = await this.regCenterOrderSve.regReceiveSolutionPayInfo(pobj);
                 break;
-            // case "receiveOrderStatusNotify"://接收订单状态推送 百度reg 2.3
-            //     opResult = await this.regCenterOrderSve.receiveOrderStatusNotify(pobj);
-            //     break;
+            case "regFeedbackSubmit"://接收需求反馈 百度reg 2.2
+                opResult = await this.regCenterOrderSve.regFeedbackSubmit(pobj);
+                break;
             case "getItemByChannelSolutionNo"://渠道方案号获取需求详情
                 opResult = await this.regCenterOrderSve.getItemByChannelSolutionNo(pobj, pobj.actionBody, req);
                 break;

center-order/app/base/service/impl/qcutils/regCenterOrderSve.js

@@ -13,11 +13,12 @@ class RegCenterOrderService extends ServiceBase {
 
     //工商注册状态
     this.regSolutionStatus = {
-      'RECEIVED': '已接单',//
-      'COLLECTING': '材料收集环节',//
-      'AUDITING': '工商审核环节',//
-      'ENGRAVING': '刻章环节',//
-      'SUCCESS': '已完成' //
+      'RECEIVED': '已接单',
+      'COLLECTING': '材料收集环节',
+      'AUDITING': '工商审核环节',
+      'ENGRAVING': '刻章环节',
+      'SUCCESS': '已完成', 
+      'PAID':'已支付'
     };
 
     //工商注册状态
@@ -99,15 +100,23 @@ class RegCenterOrderService extends ServiceBase {
     var ns = await this.needsolutionDao.model.findOne({
       where: { channelNeedNo: ab.intentionBizId, isInvalid: 0 }, raw: true
     });
-    if (!ns) {
-      return system.getResultFail(-106, "未知方案");
-    }
     var intentionStatusList = ["未知", "⽅案待服务商确认", "⽅案待⽤户确认", "处理中", "已完成", "已关闭"];
     var updateObj = {};
     var solutionContent;
     var i;
-    var nsLength = ns.length
-    if(ns){
+    var needData = {id: needinfo.id};
+    if (!ns) {
+      //如果没有方案直接关闭需求，更新需求状态
+      if(ab.intentionStatus){
+        if(ab.intentionStatus == 5){
+          needData['status'] = 'ygb'
+        }
+        if(ab.intentionStatus == 1){
+          needData["status"] = "ybh";
+        }
+        await this.needinfoDao.update(needData);//更新状态修改
+      }
+    }else{
       for(i=0;i<nsLength;i++){
         updateObj = {
           id: ns[i].id
@@ -216,9 +225,8 @@ class RegCenterOrderService extends ServiceBase {
     }
     var solutionContent = ns.solutionContent;
     var checkStatus = {
-      ACCOUNT_REGISTERED: "完成账户注册", MATERIAL_SUBMITTED: "完成资料递交",
-      GXB_ACCEPT: "⼯信部已受理", GXB_REFUSE: "⼯信部不予受理", GXB_FAIL: "⼯信部未通过", GXB_SUCCESS: "工信部通过"
-      , CLOSE: "方案关闭"
+      COLLECTING: "材料收集环节",AUDITING: "工商审核环节",
+      ENGRAVING:"刻章环节",SUCCESS:"已完成", CLOSE: "方案关闭"
     };
     if (solutionContent.status && checkStatus[solutionContent.status]) {
       return system.getResultFail(-111, "方案已进入" + solutionContent.statusName + "流程，不能执行此操作");
@@ -227,45 +235,44 @@ class RegCenterOrderService extends ServiceBase {
     var solutionFlowList = solutionContent.solutionFlowList || [];
     if (ab.status == "1") {//⽤户已支付
       var afterStatusList = [//用户支付后的流程状态
-        "USER_UPLOADED", "MATERIAL_UNCONFIRM", "USER_CONFIRMED", "ACCOUNT_REGISTERED",
-        "MATERIAL_SUBMITTED", "GXB_ACCEPT", "GXB_REFUSE", "GXB_FAIL", "GXB_SUCCESS", "CLOSE"
+        "COLLECTING", "AUDITING", "ENGRAVING" ,"SUCCESS"
       ];
       if (!solutionContent.status || afterStatusList.indexOf(solutionContent.status) < 0) {
         solutionFlowList.push({
-          status: "PAID", statusName: this.icpSolutionStatusReference.PAID, updated_at: new Date()
+          status: "PAID", statusName: this.regSolutionStatus.PAID, updated_at: new Date()
         });
         solutionContent.status = "PAID";
-        solutionContent.statusName = this.icpSolutionStatusReference.PAID;
+        solutionContent.statusName = this.regSolutionStatus.PAID;
       }
       //修改 n_need_info status为ycd 已成单
       let needObj = {
         id: needinfo.id, status: "ycd"
       }
       await this.needinfoDao.update(needObj);//关闭需求
-    } else if (ab.status == "2") {//⽤户已上传
-      if (solutionContent.status == "USER_CONFIRMED") {//防止用户确认后又否决
-        return system.getResultFail(-112, "操作失败，⽤户已确认递交⽂件");
+    } else if (ab.status == "4") {//材料收集
+      if (solutionContent.status == "COLLECTING") {
+        return system.getResultFail(-112, "操作失败，材料已收集");
       }
       solutionFlowList.push({
-        status: "USER_UPLOADED", statusName: this.icpSolutionStatusReference.USER_UPLOADED, updated_at: new Date()
+        status: "COLLECTING", statusName: this.regSolutionStatus.COLLECTING, updated_at: new Date()
       });
-      solutionContent.status = "USER_UPLOADED";
-      solutionContent.statusName = this.icpSolutionStatusReference.USER_UPLOADED;
-    } else if (ab.status == "4") {//⽤户已确认
-      if (solutionContent.status != "MATERIAL_UNCONFIRM") {
-        return system.getResultFail(-113, "操作失败，服务商递交⽂件后才能执行此操作");
+      solutionContent.status = "COLLECTING";
+      solutionContent.statusName = this.regSolutionStatus.COLLECTING;
+    } else if (ab.status == "AUDITING") {//工商审核
+      if (solutionContent.status != "COLLECTING") {
+        return system.getResultFail(-113, "操作失败，材料收集环节后才能执行此操作");
       }
       solutionFlowList.push({
-        status: "USER_CONFIRMED", statusName: this.icpSolutionStatusReference.USER_CONFIRMED, updated_at: new Date()
+        status: "AUDITING", statusName: this.regSolutionStatus.AUDITING, updated_at: new Date()
       });
-      solutionContent.status = "USER_CONFIRMED";
-      solutionContent.statusName = this.icpSolutionStatusReference.USER_CONFIRMED;
-    } else if (ab.status == "11") {//⽅案已关闭
+      solutionContent.status = "AUDITING";
+      solutionContent.statusName = this.regSolutionStatus.AUDITING;
+    } else if (ab.status == "CLOSE") {//⽅案已关闭
       solutionFlowList.push({
-        status: "CLOSE", statusName: this.icpSolutionStatusReference.CLOSE, updated_at: new Date()
+        status: "CLOSE", statusName: this.regSolutionStatus.CLOSE, updated_at: new Date()
       });
       solutionContent.status = "CLOSE";
-      solutionContent.statusName = this.icpSolutionStatusReference.CLOSE;
+      solutionContent.statusName = this.regSolutionStatus.CLOSE;
     } else {
       return system.getResultFail(-110, "状态错误");
     }
@@ -304,7 +311,7 @@ class RegCenterOrderService extends ServiceBase {
     var updateObj = {
       id: ns.id, solutionContent: solutionContent
     };
-    if (ab.status == "11") {//⽅案已关闭
+    if (ab.status == "CLOSE") {//⽅案已关闭
       updateObj["status"] = "yzf";
       updateObj["isInvalid"] = 1;
     }
@@ -1062,8 +1069,8 @@ class RegCenterOrderService extends ServiceBase {
       var channelOrderNo = orderInfo.channelOrderNo
     }
     if (ab.ApplicationStatus == 702) {//材料收集环节
-      if (needsolutioninfo.solutionContent.status != "RECEIVED") {
-        return system.getResultFail(-702, "交付流程错误，请先完成账户注册");
+      if (needsolutioninfo.solutionContent.status != "PAID") {
+        return system.getResultFail(-702, "交付流程错误，请先完成支付");
       }
       deliveryContent['ApplicationStatus'] = 702;
       solutionFlowList.push({
@@ -1075,7 +1082,7 @@ class RegCenterOrderService extends ServiceBase {
     }
     if (ab.ApplicationStatus == 703) {//工商审核环节
       if (deliveryContent.status != "COLLECTING") {
-        return system.getResultFail(-703, "交付流程错误，请先完成账户注册");
+        return system.getResultFail(-703, "交付流程错误，请先已接单");
       }
       deliveryContent['ApplicationStatus'] = 703;
       solutionFlowList.push({
@@ -1087,7 +1094,7 @@ class RegCenterOrderService extends ServiceBase {
     }
     if (ab.ApplicationStatus == 704) {//刻章环节
       if (deliveryContent.status != "AUDITING") {
-        return system.getResultFail(-704, "交付流程错误，请先完成资料递交");
+        return system.getResultFail(-704, "交付流程错误，请先材料收集环节");
       }
       deliveryContent['ApplicationStatus'] = 704;
       solutionFlowList.push({
@@ -1099,7 +1106,7 @@ class RegCenterOrderService extends ServiceBase {
     }
     if (ab.ApplicationStatus == 705) {//已完成
       if (deliveryContent.status != "ENGRAVING") {
-        return system.getResultFail(-705, "交付流程错误，请先完成资料递交");
+        return system.getResultFail(-705, "交付流程错误，请先材料收集环节");
       }
       deliveryContent['ApplicationStatus'] = 705;
       solutionFlowList.push({