商机验重

ic-deliver/app/base/controller/impl/bizchance/bizoptCtl.js

@@ -233,6 +233,15 @@ class BizOptCtl extends CtlBase {
     var pobj = nobj.d;
     var pobj = nobj.d;
     if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.businessType && pobj.businessType != 'undefined') {
     if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.businessType && pobj.businessType != 'undefined') {
       try {
       try {
+        const businessData = await this.service.findOne({ demand_code: pobj.businessMode });
+        if (businessData) {
+          return {
+            "status": 1,    //1代表成功，否则失败
+            "msg": "已处理成功!",
+            "data": "",
+            "requestId": ""
+          }
+        } else {
           //pobj.currentStatus = "beforeSubmission";//加上当前状态为待提交方案
           //pobj.currentStatus = "beforeSubmission";//加上当前状态为待提交方案
           // pobj.channelSource = "tencentCloud";//目前渠道只有腾讯
           // pobj.channelSource = "tencentCloud";//目前渠道只有腾讯
           // pobj.sourceNumber = "1111111";
           // pobj.sourceNumber = "1111111";
@@ -253,6 +262,7 @@ class BizOptCtl extends CtlBase {
             "requestId": ""
             "requestId": ""
           };
           };
         }
         }
+      }
       catch (error) {
       catch (error) {
         console.log("TTTTTTTTTTTTTTTTTTTTTTT");
         console.log("TTTTTTTTTTTTTTTTTTTTTTT");
         console.log(error);
         console.log(error);

ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js

@@ -699,7 +699,7 @@ class DeliverybillCtl extends CtlBase {
       try {
       try {
         var res = await this.service.findInfoByDeliverCode(pobj);
         var res = await this.service.findInfoByDeliverCode(pobj);
         if (res) {
         if (res) {
-          if (res.delivery_status != 'received'){//如果数据库中状态是已接单，说明是第一次提交文件，状态为传过了的状态；如果不是已接单，说明是客户驳回后重新提交的文件，状态改为已驳回
+          if (res.delivery_status != 'received' && res.delivery_status != 'userUploadWait') {//如果数据库中状态是已接单、待用户上传，说明是第一次提交文件，状态为传过了的状态；如果不是已接单、待用户上传，说明是客户驳回后重新提交的文件，状态改为已驳回
             pobj.deliverStatus = "userConfirmationReject";//状态改成驳回,
             pobj.deliverStatus = "userConfirmationReject";//状态改成驳回,
           }
           }
           await this.service.updateInfoByDeliverCode(pobj);
           await this.service.updateInfoByDeliverCode(pobj);