lin update

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

@@ -72,6 +72,9 @@ class IcAPI extends APIBase {
             case "updateStausByRefundOrder"://修改退款方案状态
             case "updateStausByRefundOrder"://修改退款方案状态
                 opResult = await this.needsolutionSve.updateStausByRefundOrder(pobj);
                 opResult = await this.needsolutionSve.updateStausByRefundOrder(pobj);
                 break;
                 break;
+            case "getProgrammeInfoByChannelSolutionNo"://修改退款方案状态
+                opResult = await this.needsolutionSve.getProgrammeInfoByChannelSolutionNo(pobj);
+                break;
             default:
             default:
                 opResult = system.getResult(null, "action_type参数错误");
                 opResult = system.getResult(null, "action_type参数错误");
                 break;
                 break;

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

@@ -203,6 +203,24 @@ class NeedsolutionService extends ServiceBase {
     });
     });
     return system.getResultSuccess(ns);
     return system.getResultSuccess(ns);
   }
   }
+
+  // 2020 1017 lin 新增 根据渠道方案号查看方案
+  async getProgrammeInfoByChannelSolutionNo(pobj) {
+    var ab = pobj.actionBody;
+    if (!ab.channelSolutionNo) {
+      return system.getResultFail(-101, "渠道方案号不能为空");
+    }
+    //获取需求信息
+    var needsolutioninfo = await this.dao.model.findOne({
+      attributes:["id","solutionContent","status","orderNo"],
+      where: { channelSolutionNo: ab.channelSolutionNo,isInvalid:0 }, raw: true
+    });
+    if (!needsolutioninfo || !needsolutioninfo.id) {
+      return system.getResultFail(-102, "未知方案信息");
+    }
+    return system.getResultSuccess(needsolutioninfo);
+  }
+
   //获取方案列表（获取用户所有方案）
   //获取方案列表（获取用户所有方案）
   async getProgrammeListByUser(pobj) {
   async getProgrammeListByUser(pobj) {
     var ab = pobj.actionBody;
     var ab = pobj.actionBody;
@@ -485,11 +503,13 @@ class NeedsolutionService extends ServiceBase {
       // solutionContent = JSON.parse(solutionContent);
       // solutionContent = JSON.parse(solutionContent);
       solutionContent["totalSum"] = Number(ab.orderPrice || "0");
       solutionContent["totalSum"] = Number(ab.orderPrice || "0");
     }
     }
-    if (ab.status) {
-      needsolutioninfo.status = "ywc";
-    }
+    // 2020 1017 lin 新增去掉status的判断，生成订单这个方案才算完成，所以没必要再判断，另一个原因网文2.3每个状态都有不同status，所以不能以来有没有status来决定方案完成情况。
+    // if (ab.status) {
+    //   needsolutioninfo.status = "ywc";
+    // }
     if (ab.orderNo) {
     if (ab.orderNo) {
       needsolutioninfo.orderNo = ab.orderNo;
       needsolutioninfo.orderNo = ab.orderNo;
+      needsolutioninfo.status = "ywc";
     }
     }
     needsolutioninfo.solutionContent = JSON.stringify(solutionContent);
     needsolutioninfo.solutionContent = JSON.stringify(solutionContent);
     await this.dao.update(needsolutioninfo);
     await this.dao.update(needsolutioninfo);

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

@@ -1020,6 +1020,7 @@ class AliyunQcService {
       id: ns.id,
       id: ns.id,
       solutionContent: solutionContent,
       solutionContent: solutionContent,
     };
     };
+    // 这里修改进去了
     if(ab.bizId != ns.channelDeliverId) {
     if(ab.bizId != ns.channelDeliverId) {
       updateObj.channelDeliverId = ab.bizId
       updateObj.channelDeliverId = ab.bizId
     }
     }