baiduIcp2

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

@@ -174,8 +174,7 @@ class NeedinfoService extends ServiceBase {
       return system.getResult(null, "需求数据为空，30210");
       return system.getResult(null, "需求数据为空，30210");
     }
     }
     var item = await this.dao.getItemByNeedNo(solutionitem.needNo);
     var item = await this.dao.getItemByNeedNo(solutionitem.needNo);
-    item.solutionProvince = solutionitem.solutionContent.solution.Area;
-    //item.solutionProvince = solutionitem.solutionContent.solution.Area + `（${solutionitem.solutionContent.solution.ActionType}）`//北京（新办）;
+    item.solutionProvince = solutionitem.solutionContent.solution.Area + `（${solutionitem.solutionContent.solution.ActionType}）`//北京（新办）;
     item.solutionContent = solutionitem.solutionContent
     item.solutionContent = solutionitem.solutionContent
     item.channelSolutionNo = solutionitem.channelSolutionNo
     item.channelSolutionNo = solutionitem.channelSolutionNo
     if (!item) {
     if (!item) {

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

@@ -485,6 +485,17 @@ class NeedsolutionService extends ServiceBase {
     if (!app || !app.uapp_id) {
     if (!app || !app.uapp_id) {
       return system.getResultFail(-100, "未知渠道");
       return system.getResultFail(-100, "未知渠道");
     }
     }
+    var ns
+    // 2020 1021 lin 修改  if (ab.isDirectBuy 为 ==true 原因 实际传的是字符串不是布尔
+    if (ab.isDirectBuy === "true"){//直购先创建空方案
+      var solutionNo = await this.getBusUid("ns");
+      ns = await this.create({
+        solutionNo,
+        ...ab,
+        status:"ywc",
+        solutionContent:JSON.stringify({totalSum: Number(ab.orderPrice || "0")})
+      })
+    }else {
       if (!ab.channelSolutionNo) {
       if (!ab.channelSolutionNo) {
         return system.getResultFail(-101, "渠道方案编号不能为空");
         return system.getResultFail(-101, "渠道方案编号不能为空");
       }
       }
@@ -492,8 +503,8 @@ class NeedsolutionService extends ServiceBase {
       //   return system.getResultFail(-102,"状态不能为空");
       //   return system.getResultFail(-102,"状态不能为空");
       // }
       // }
       var needsolutioninfo = await this.dao.model.findOne({
       var needsolutioninfo = await this.dao.model.findOne({
-      attributes:["id","solutionContent","status","orderNo"],
-      where: { channelSolutionNo: ab.channelSolutionNo,isInvalid:0 }, raw: true
+        attributes: ["id", "solutionContent", "status", "orderNo"],
+        where: {channelSolutionNo: ab.channelSolutionNo, isInvalid: 0}, raw: true
       });
       });
       if (!needsolutioninfo || !needsolutioninfo.id) {
       if (!needsolutioninfo || !needsolutioninfo.id) {
         return system.getResultFail(-400, "未知方案");
         return system.getResultFail(-400, "未知方案");
@@ -513,9 +524,10 @@ class NeedsolutionService extends ServiceBase {
       }
       }
       needsolutioninfo.solutionContent = JSON.stringify(solutionContent);
       needsolutioninfo.solutionContent = JSON.stringify(solutionContent);
       await this.dao.update(needsolutioninfo);
       await this.dao.update(needsolutioninfo);
-    var ns = await this.dao.model.findOne({
+      ns = await this.dao.model.findOne({
         where: { id: needsolutioninfo.id }, raw: true
         where: { id: needsolutioninfo.id }, raw: true
       });
       });
+    }
     return system.getResultSuccess(ns);
     return system.getResultSuccess(ns);
   }
   }