laolan

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

@@ -85,12 +85,8 @@ class QcAPI extends APIBase {
             case "receiveIcpConfirmUrl"://前端关闭ICP需求及方案
                 opResult = await this.aliyunqcSve.receiveIcpConfirmUrl(pobj);
                 break;
-            
             // --------- 网文 ---------
-
-            case "ncGetNeedList"://查询需求列表(网文)2020-11-11
-                opResult = await this.ncSve.ncGetNeedList(pobj);
-                break;
+            
             case "ncSubmitMaterial"://交付材料提交(网文)2020-11-11
                 opResult = await this.ncSve.ncSubmitMaterial(pobj);
                 break;
@@ -100,27 +96,16 @@ class QcAPI extends APIBase {
             case "ncSubmitSolution"://提交方案(网文)2020-11-11
                 opResult = await this.ncSve.ncSubmitSolution(pobj);
                 break;
-            case "ncWriteCommunicationRecord"://提交沟通记录(网文)2020-11-11
-                opResult = await this.ncSve.ncWriteCommunicationRecord(pobj);
-                break;
-            case "ncGetCommunicationRecord"://查询沟通记录(网文)2020-11-11
-                opResult = await this.ncSve.ncGetCommunicationRecord(pobj);
-                break;
-            case "ncCloseNeed"://关闭需求(网文)2020-11-11
-                opResult = await this.ncSve.ncCloseNeed(pobj);
-                break;
-            case "ncClosePlan"://关闭方案(网文)2020-11-11
+            case "ncClosePlan"://关闭需求(网文)2020-11-11
                 opResult = await this.ncSve.ncClosePlan(pobj);
                 break;
-            case "ncCloseOrderDelivery"://关闭交付单(网文)2020-11-11
-                opResult = await this.ncSve.ncCloseOrderDelivery(pobj);
+            case "ncReceiveProgrammeNo":
+                opResult = await this.ncSve.ncReceiveProgrammeNo(pobj);
                 break;
+           
 
             // --------- 广电 ---------
 
-            case "rtGetNeedList"://查询需求列表(广电)2020-11-11
-                opResult = await this.rtSve.rtGetNeedList(pobj);
-                break;
             case "rtSubmitMaterial"://交付材料提交(广电)2020-11-11
                 opResult = await this.rtSve.rtSubmitMaterial(pobj);
                 break;
@@ -130,23 +115,13 @@ class QcAPI extends APIBase {
             case "rtSubmitSolution"://提交方案(广电)2020-11-11
                 opResult = await this.rtSve.rtSubmitSolution(pobj);
                 break;
-            case "rtWriteCommunicationRecord"://提交沟通记录(广电)2020-11-11
-                opResult = await this.rtSve.rtWriteCommunicationRecord(pobj);
-                break;
-            case "rtGetCommunicationRecord"://查询沟通记录(广电)2020-11-11
-                opResult = await this.rtSve.rtGetCommunicationRecord(pobj);
-                break;
-            case "rtCloseNeed"://关闭需求(广电)2020-11-11
-                opResult = await this.rtSve.rtCloseNeed(pobj);
-                break;
-            case "rtClosePlan"://关闭方案(广电)2020-11-11
+            case "rtClosePlan"://关闭需求(广电)2020-11-11
                 opResult = await this.rtSve.rtClosePlan(pobj);
                 break;
-            case "rtCloseOrderDelivery"://关闭交付单(广电)2020-11-11
-                opResult = await this.rtSve.rtCloseOrderDelivery(pobj);
+            case "rtReceiveProgrammeNo":
+                opResult = await this.rtSve.rtReceiveProgrammeNo(pobj);
                 break;
-            
-
+            // ----------------------------------------
             case "receiveOrderStatusNotify"://接收订单状态推送 百度icp 2.3
                 opResult = await this.baiduqcSve.receiveOrderStatusNotify(pobj);
                 break;

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

@@ -73,6 +73,7 @@ class BaseQcService {
   
   //根据需求关闭ICP方案（关闭需求后调用）
   async abolishIcpProgrammeByNeed(pobj) {
+    console.log("abolishIcpProgrammeByNeed+++",pobj)
     var ab = pobj.actionBody;
     var app = pobj.appInfo;
     if (!app || !app.uapp_id) {
@@ -126,6 +127,7 @@ class BaseQcService {
     })
 
   }
+
   //根据需求查看方案列表
   async getProgrammeInfoByChannelNeedNo(pobj) {
     var ab = pobj.actionBody;
@@ -444,6 +446,20 @@ class BaseQcService {
     if (!solutionContent) {
       return system.getResultFail(-402, "方案交付信息有误");
     }
+    //----
+    var productType = solutionContent.solution;
+    if(productType &&  productType.IcpType){
+      productType = productType.IcpType
+      switch (productType) {
+        case "5":
+          productType = "ICP"
+          break;
+        case "7":
+          productType = "EDI"
+          break;
+      }
+    }
+    //----
     var orderInfo = await this.orderinfoDao.model.findOne({
       attributes: ["uapp_id"],
       where: {orderNo: needsolutioninfo.orderNo}, raw: true
@@ -506,6 +522,7 @@ class BaseQcService {
         var uappIds = orderInfo.uapp_id;
         new_needsolutioninfo['orderChannelNo'] = orderInfo.channelOrderNo;
         new_needsolutioninfo['uapp_id'] = uappIds;
+        new_needsolutioninfo['productType'] = productType;
       }
       console.log('new_needsolutioninfo+++',new_needsolutioninfo)
       //2020-10-27 laolan end

center-order/app/config/localsettings.js

 var settings={
   redis:{
-    host: "121.36.3.35",
-    port: 8967,
-    password: "Gongsibao2018",
+    host: "39.107.234.14",
+    port: 6379,
+    password: "123123",
     db:9,
   },
   database:{