receiveEdiStatusNotify

f1d87f1f · linboxuan · 99467d72 · f1d87f1f
Commit f1d87f1f authored Sep 28, 2020 by linboxuan
Hide whitespace changes
Inline Side-by-side

Showing with 29 additions and 23 deletions

center-order/app/base/service/impl/qcutils/aliyunqcSve.js
+29 -23

No files found.
--- a/center-order/app/base/service/impl/qcutils/aliyunqcSve.js
+++ b/center-order/app/base/service/impl/qcutils/aliyunqcSve.js
@@ -17,20 +17,28 @@ class AliyunQcService {
      GXB_ACCEPT: "⼯信部已受理", GXB_REFUSE: "⼯信部不予受理", GXB_FAIL: "⼯信部未通过", GXB_SUCCESS: "工信部通过"
      , CLOSE: "方案关闭"
    };
-<<<<<<< HEAD
    this.ediSolutionStatusReference = {
      SOLUTION_SUBMIT: "服务单通知服务商",
-      USER_PAY_PRODUCE: "⽤户⽀付", USER_CONFIRM_PRODUCE: "⽤户确认资料",
+      USER_PAY_PRODUCE: "⽤户⽀付", 
-      USER_REFUSE_PRODUCE: "资料退回修改", ABC_CLOSE_PRODUCE: "⼩⼆后台关闭服务单", USER_UPLOAD_PRODUCE: "⽤户补充基本资料"
+      USER_CONFIRM_PRODUCE: "⽤户确认资料",
+      USER_REFUSE_PRODUCE: "资料退回修改", 
+      ABC_CLOSE_PRODUCE: "⼩⼆后台关闭服务单", 
+      USER_UPLOAD_PRODUCE: "⽤户补充基本资料"
+    };
+    this.ediProduceStatus = {
+      110: "⽤户⽀付", 
+      30: "待⽤户确认",
+      105: "账户已注册", 
+      35: "待提交审核", 
+      109: "管局已通过",
+      106: "材料已递交⼯信部",
+      10: "已⽀付",
+      108: "管局不予受理",
+      0: "初始状态",
+      50: "订单关闭",
+      25: "待⽤户提交材料",
+      107: "管局已受理"
    };
-    this.icpApplicationStatusReference={
-      507:"完成账户注册",
-      508:"服务商完成提交资料到⼯信部",
-      509:"⼯商部已受理",
-      510:"⼯商部不予受理",
-      511:"⼯商部通过",
-      512:"⼯商部未通过"
-=======
    this.icpApplicationStatusReference = {
      507: "完成账户注册",
      508: "服务商完成提交资料到⼯信部",
@@ -59,7 +67,6 @@ class AliyunQcService {
      "CERT_GXB_SUCCESS": "⼯商部通过",
      "CERT_GXB_FAIL": "⼯商部未通过",
      "CERT_GXB_REFUSE": "⼯商部不予受理"
->>>>>>> 5c38b252841e34fee9b52571328ed3842659da89
    };
  }
  //根据需求关闭ICP方案（关闭需求后调用）
@@ -941,8 +948,7 @@ class AliyunQcService {
      return system.getResultFail(-105, "该方案需求状态为" + needinfo.statusName + ",不能执行此操作");
    }
    var solutionContent = ns.solutionContent;
-    var checkStatus = {USER_PAY_PRODUCE: "⽤户⽀付", USER_CONFIRM_PRODUCE: "⽤户确认资料",
+    var checkStatus = {ABC_CLOSE_PRODUCE: "⼩⼆后台关闭服务单"};
-    USER_REFUSE_PRODUCE: "资料退回修改", ABC_CLOSE_PRODUCE: "⼩⼆后台关闭服务单", USER_UPLOAD_PRODUCE: "⽤户补充基本资料"};
    if(solutionContent.status && checkStatus[solutionContent.status]){
      return system.getResultFail(-111, "方案已进入"+solutionContent.statusName+"流程，不能执行此操作");
    }
@@ -953,7 +959,7 @@ class AliyunQcService {
        status: "USER_PAY_PRODUCE", statusName: this.ediSolutionStatusReference.USER_PAY_PRODUCE, updated_at: new Date()
      });
      solutionContent.status = "USER_PAY_PRODUCE";
-      solutionContent.statusName = this.icpSolutionStatusReference.USER_PAY_PRODUCE;
+      solutionContent.statusName = this.ediSolutionStatusReference.USER_PAY_PRODUCE;
      // 2020 0826 lin修改 n_need_info status为ycd 已成单
      let needObj = {
        id: needinfo.id, status: "ycd"
@@ -961,28 +967,28 @@ class AliyunQcService {
      await this.needinfoDao.update(needObj);//关闭需求
    }else if (ab.operationType == "USER_CONFIRM_PRODUCE") {//⽤户确认资料
      solutionFlowList.push({
-        status: "USER_CONFIRM_PRODUCE", statusName: this.icpSolutionStatusReference.USER_CONFIRM_PRODUCE, updated_at: new Date()
+        status: "USER_CONFIRM_PRODUCE", statusName: this.ediSolutionStatusReference.USER_CONFIRM_PRODUCE, updated_at: new Date()
      });
      solutionContent.status = "USER_CONFIRM_PRODUCE";
-      solutionContent.statusName = this.icpSolutionStatusReference.USER_CONFIRM_PRODUCE;
+      solutionContent.statusName = this.ediSolutionStatusReference.USER_CONFIRM_PRODUCE;
    }else if (ab.operationType == "USER_REFUSE_PRODUCE") {//资料退回修改
      solutionFlowList.push({
-        status: "USER_REFUSE_PRODUCE", statusName: this.icpSolutionStatusReference.USER_REFUSE_PRODUCE, updated_at: new Date()
+        status: "USER_REFUSE_PRODUCE", statusName: this.ediSolutionStatusReference.USER_REFUSE_PRODUCE, updated_at: new Date()
      });
      solutionContent.status = "USER_REFUSE_PRODUCE";
-      solutionContent.statusName = this.icpSolutionStatusReference.USER_REFUSE_PRODUCE;
+      solutionContent.statusName = this.ediSolutionStatusReference.USER_REFUSE_PRODUCE;
    }else if (ab.operationType == "USER_UPLOAD_PRODUCE") {//⽤户补充基本资料
      solutionFlowList.push({
-        status: "USER_UPLOAD_PRODUCE", statusName: this.icpSolutionStatusReference.USER_UPLOAD_PRODUCE, updated_at: new Date()
+        status: "USER_UPLOAD_PRODUCE", statusName: this.ediSolutionStatusReference.USER_UPLOAD_PRODUCE, updated_at: new Date()
      });
      solutionContent.status = "USER_UPLOAD_PRODUCE";
-      solutionContent.statusName = this.icpSolutionStatusReference.USER_UPLOAD_PRODUCE;
+      solutionContent.statusName = this.ediSolutionStatusReference.USER_UPLOAD_PRODUCE;
    }else if (ab.operationType == "ABC_CLOSE_PRODUCE") {//⽅案已关闭
      solutionFlowList.push({
-        status: "ABC_CLOSE_PRODUCE", statusName: this.icpSolutionStatusReference.ABC_CLOSE_PRODUCE, updated_at: new Date()
+        status: "ABC_CLOSE_PRODUCE", statusName: this.ediSolutionStatusReference.ABC_CLOSE_PRODUCE, updated_at: new Date()
      });
      solutionContent.status = "ABC_CLOSE_PRODUCE";
-      solutionContent.statusName = this.icpSolutionStatusReference.ABC_CLOSE_PRODUCE;
+      solutionContent.statusName = this.ediSolutionStatusReference.ABC_CLOSE_PRODUCE;
    }else{
      return system.getResultFail(-110, "状态错误");
    }