zhuangbing

center-order/app/base/db/metadata/apps/platform.js

@@ -72,7 +72,7 @@ module.exports = {
             "push_chance_type": { "wts": "未推送", "yts": "已推送", "ygj": "已跟进", "ycd": "已成单" },
             "policy_type":{'fzbt':'租金减免','jrdk':'金融贷款','zdfc':'行政措施','ssjm':'税收优惠','rlzy':'人力资源'},
             "customer_intention":{"dgj":"待跟进","yyx":"有意向","wyx":"无意向"},
-            "solution_status":{"ytj":"已提交","yfk":"已付款","yzf":"已作废","ytk":"已退款"},
+            "solution_status":{"dqr":"待确认","ywc":"已完成","yzf":"已作废"},
 
         },
     }

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

@@ -45,7 +45,7 @@ class NeedsolutionService extends ServiceBase {
     ab["channelNeedNo"] = needinfo.channelNeedNo;
     var solutionNo = await this.getBusUid("ns");
     ab["solutionNo"] = solutionNo;
-    ab["status"] = "ytj";
+    ab["status"] = "dqr";
     ab.solutionContent = JSON.stringify(ab.solutionContent);
     var od = await this.dao.create(ab);
     if(od && od.id){
@@ -217,13 +217,13 @@ class NeedsolutionService extends ServiceBase {
     if(ab.operateType=="INVALID"){// INVALID：作废
       status="yzf";
     }else if(ab.operateType=="REFUND"){// REFUND：退款
-      status="ytk";
+      status="yzf";
     }else if(ab.operateType=="PAID"){// PAID：支付
-      status="yfk";
+      status="ywc";
     }else{
       return system.getResultFail(-104,"操作类型有误");
     }
-    var solution_status={"ytj":"已提交","yfk":"已付款","yzf":"已作废","ytk":"已退款"};
+    var solution_status={"dqr":"待确认","ywc":"已完成","yzf":"已作废"};
     solutionContent["deliveryStatus"] = status;
     solutionContent["deliveryStatusName"] = solution_status[status];
     solutionContent["updated"] = new Date();
@@ -254,6 +254,9 @@ class NeedsolutionService extends ServiceBase {
     if(!ns || !ns.id){
       return system.getResultFail(-102,"未知方案");
     }
+    if(ns.status!="dqr"){
+      return system.getResultFail(-103,"方案状态错误，只能废弃待确认方案");
+    }
     await this.dao.update({id:ns.id,status:"yzf"});//方案废弃
     return system.getResultSuccess();
   }