gyq

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

@@ -4,9 +4,11 @@ const querystring = require('querystring');
 var settings = require("../../../../config/settings");
 const CtlBase = require("../../ctl.base");
 const moment = require('moment');
+const appconfig = system.getSysConfig();
 class BizOptCtl extends CtlBase {
   constructor() {
     super("bizchance", CtlBase.getServiceName(BizOptCtl));
+    this.receiveUrl = "http://192.168.1.140:4011/api/receive/entService/springBoard";
   }
 
   /*根据用户id获取商机信息，分页获取*/
@@ -24,8 +26,8 @@ class BizOptCtl extends CtlBase {
         robj.demand_code = element.demand_code;//商机编号
         robj.source = element.source_name;//商机来源
         robj.business_type = element.business_type;//商机类型
-        robj.business_info_person = element.business_info.contacts_name;//联系人
-        robj.business_info_phone = element.business_info.contacts_phone;//联系电话
+        robj.business_info_person = element.business_info.contactsName;//联系人
+        robj.business_info_phone = element.business_info.contactsPhone;//联系电话
         robj.business_status = element.business_status;//商机当前状态
         robj.updated_at = this.timeFormat(element.updated_at);//商机当前状态日期
         rarr.push(robj);
@@ -48,15 +50,24 @@ class BizOptCtl extends CtlBase {
           rarr.id =  rs.id;//数据的id
           rarr.businessMode = rs.demand_code;//商机编号
           rarr.channelSource = rs.source_name;//渠道来源
-          rarr.businessType = rs.business_type;//商机类型
+          rarr.businessType = rs.business_type;//商机类型代码
+          rarr.businessName = appconfig.pdict.businessType[rarr.businessType];//商机类型名称
           rarr.currentStatus = rs.business_status;//商机状态
-          rarr.serviceArea = rs.service_address;//服务地区
+          rarr.serviceCode = rs.service_address;//服务地区
+          if (rarr.businessName == "园区注册"){
+            rarr.serviceName = appconfig.pdict.registeredParkDict[rarr.serviceCode];//服务地区名称
+          }
+          else{
+            rarr.serviceName = appconfig.pdict.registeredAreaDict[rarr.serviceCode];//服务地区名称
+          }
           rarr.statusReason = rs.close_reason;//商机关闭原因
           rarr.clerkName = rs.salesman_name;//业务员名称
           rarr.clerkPhone = rs.salesman_phone;//业务员联系方式
-          rarr.memoInfo = rs.business_info.memo_info;//备注信息
-          rarr.contactsName = rs.business_info.contacts_name;//联系人名称
-          rarr.contactsPhone = rs.business_info.contacts_phone;//联系人联系方式
+          rarr.memoInfo = rs.business_info.memoInfo;//备注信息
+          rarr.contactsName = rs.business_info.contactsName;//联系人名称
+          rarr.contactsPhone = rs.business_info.contactsPhone;//联系人联系方式
+          rarr.servicerCode = rs.facilitator_id;//服务商编码
+          rarr.servicerName = rs.facilitator_name;//服务商名称
           rarr.createdTime =  this.timeFormat(rs.created_at);//商机创建时间
           rarr.statusTime =  this.timeFormat(rs.updated_at);//当前状态时间
         }
@@ -77,8 +88,25 @@ class BizOptCtl extends CtlBase {
       try{
         var res = await this.service.updateStatusByDemandCode(pobj);
         //调商城接口，回传状态信息，后加
-
-        return system.getResult("更新成功！");
+        if (pobj.currentStatus == "isClosed"){
+          var rc = system.getObject("util.execClient");
+          var requrl = this.receiveUrl;
+          var params =  {
+            "actionType":"closeNeed",
+            "actionBody":{
+              "needNum": pobj.businessMode,
+              "note":pobj.statusReason
+            }
+          }   
+          var rtn = await rc.execPost(params, requrl);
+          var j = JSON.parse(rtn.stdout);
+          if (j.status == 1){
+            return system.getResult("操作成功！");
+          }
+          else{
+            return system.getResultError("提交方案出错！");
+          }
+        }
       }
       catch (error){
         return system.getResultError(error);
@@ -100,9 +128,7 @@ class BizOptCtl extends CtlBase {
 module.exports = BizOptCtl;
 
 var task = new BizOptCtl();
-var obj={"demand_code":"30030302991","business_status":"isClosed","close_reason":"嗯哈哈"};
+var obj={"businessMode":"202006100001","currentStatus":"isClosed","statusReason":"未付款"};
 task.updateStatusByDemandCode(obj,{},{}).then(d=>{
   console.log(d);
-  //console.log(d[0].analyse);
-
 })

ic-deliver/app/base/db/impl/bizchance/bizoptDao.js

@@ -25,6 +25,7 @@ class BizoptDao extends Dao {
     return await this.findOne(qcwhere);
   }  
 
+  /*更新商机状态*/
   async updateStatusByDemandCode(qobj,t){
     var setobj = {"business_status":qobj.currentStatus};
     if (qobj.statusReason && qobj.statusReason != 'undefined'){
@@ -34,6 +35,11 @@ class BizoptDao extends Dao {
     return await this.updateByWhere(setobj,whereobj,t);
   }
 
+  /*插入商机信息*/
+  async insertInfo(qobj,t){
+
+  }
+
 
 }
 module.exports = BizoptDao;

ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js

@@ -35,14 +35,98 @@ class DeliverybillDao extends Dao {
     return await this.updateByWhere(setobj,whereobj,t);
   }
 
-  /*插入缓存信息*/
-  // async insertInfo(qobj,t){
-  //   var obj = {
-  //       "deliver_id":qobj.deliver_id,
-  //       "cache_info":qobj.cache_info
-  //   };
-  //   return await this.create(obj,t);
-  // }
+  /*插入交付单信息*/
+  async insertInfo(qobj,t){
+    var obj = {
+      "demand_code":qobj.businessMode,
+      "scheme_number":qobj.schemeNumber
+    };
+    if (qobj.deliverNumber && qobj.deliverNumber != 'undefined'){
+      obj.delivery_code = qobj.deliverNumber;
+    }
+    if (qobj.businessName && qobj.businessName != 'undefined'){
+      obj.product_name = qobj.businessName;
+    }
+    if (qobj.businessType && qobj.businessType != 'undefined'){
+      obj.product_code = qobj.businessType;
+    }
+    if (qobj.channelSource && qobj.channelSource != 'undefined'){
+      obj.source_name = qobj.channelSource;
+    }
+    if (qobj.channelNumber && qobj.channelNumber != 'undefined'){
+      obj.source_number = qobj.channelNumber;
+    }
+    if (qobj.serviceCode && qobj.serviceCode != 'undefined'){
+      obj.service_address = qobj.serviceCode;
+    }
+    if (qobj.servicerCode && qobj.servicerCode != 'undefined'){
+      obj.facilitator_id = qobj.servicerCode;
+    }
+    if (qobj.servicerName && qobj.servicerName  != 'undefined'){
+      obj.facilitator_name = qobj.servicerName;
+    }
+    if (qobj.clerkName && qobj.clerkName != 'undefined'){
+      obj.salesman_name = qobj.clerkName;
+    }
+    if (qobj.clerkPhone && qobj.clerkPhone != 'undefined'){
+      obj.salesman_phone = qobj.clerkPhone
+    }
+    if (qobj.clerkOpcode && qobj.clerkOpcode != 'undefined'){
+      obj.salesman_opcode = qobj.clerkOpcode;
+    }
+    if (qobj.clerkId && qobj.clerkId != 'undefined'){
+      obj.salesman_id = qobj.clerkId;
+    }
+    if (qobj.payAmount && qobj.payAmount != 'undefined'){
+      obj.selling_price = qobj.payAmount;
+    }
+    if (qobj.deliverStatus && qobj.deliverStatus != 'undefined'){
+      obj.delivery_status = qobj.deliverStatus;
+    }
+    if (qobj.costPrice && qobj.costPrice != 'undefined'){
+      obj.cost_price = qobj.costPrice;
+    }
+    if (qobj.statusReason && qobj.statusReason != 'undefined'){
+      obj.close_reason = qobj.statusReason;
+    }
+    if (qobj.isWhether && qobj.isWhether != 'undefined'){
+      obj.delivery_info.isWhether = qobj.isWhether;
+    }
+    if (qobj.isVirtual && qobj.isVirtual != 'undefined'){
+      obj.delivery_info.isVirtual = qobj.isVirtual;
+    }
+    if (qobj.officialSeal && qobj.officialSeal != 'undefined'){
+      obj.delivery_info.officialSeal = qobj.officialSeal;
+    }
+    if (qobj.businessLicense && qobj.businessLicense != 'undefined'){
+      obj.delivery_info.businessLicense = obj.businessLicense;
+    }
+    if (qobj.taxpayerType && qobj.taxpayerType != 'undefined'){
+      obj.delivery_info.taxpayerType = qobj.taxpayerType;
+    }
+    if (qobj.whetherType && qobj.whetherType != 'undefined'){
+      obj.delivery_info.whetherType = qobj.whetherType;
+    }
+    if (qobj.subjectType && qobj.subjectType != 'undefined'){
+      obj.delivery_info.subjectType = qobj.subjectType;
+    }
+    if (qobj.buyTime && qobj.buyTime != 'undefined'){
+      obj.delivery_info.buyTime = qobj.buyTime;
+    }
+    if (qobj.buyDuration && qobj.buyDuration != 'undefined'){
+      obj.delivery_info.buyDuration = qobj.buyDuration;
+    }
+    if (qobj.isRenew && qobj.isRenew != 'undefined'){
+      obj.delivery_info.isRenew = qobj.isRenew;
+    }
+    if (qobj.contactsName && qobj.contactsName != 'undefined'){
+      obj.delivery_info.contactsName = qobj.contactsName;
+    }
+    if (qobj.contactsPhone && qobj.contactsPhone != 'undefined'){
+      obj.delivery_info.contactsPhone = qobj.contactsPhone;
+    }
+    return await this.create(obj,t);
+  }
 
 
 }

ic-deliver/app/base/db/impl/bizchance/materialDao.js

@@ -23,26 +23,131 @@ class MaterialDao extends Dao {
     var obj = {
         "delivery_id":qobj.deliverId
     };
-    if (qobj.deliverNumber != 'undefined'){
+    if (qobj.deliverNumber && qobj.deliverNumber != 'undefined'){
         obj["delivery_code"] = qobj.deliverNumber;
     }
-    if (qobj.companyInfo != 'undefined'){
-        obj["company_info"] = qobj.companyInfo;
+    if (qobj.companyName && qobj.companyName != 'undefined'){
+      obj.company_info.companyName = qobj.companyName;
     }
-    if (qobj.registeredInfo != 'undefined'){
-        obj["registered_info"] = qobj.registeredInfo;
+    if (qobj.spareName && qobj.spareName != 'undefined'){
+      obj.company_info.spareName = qobj.spareName;
     }
-    if (qobj.contributionInfo != 'undefined'){
-        obj["contribution_info"] = qobj.contributionInfo;
+    if (qobj.taxpayerType && qobj.taxpayerType != 'undefined'){
+      obj.company_info.taxpayerType = qobj.taxpayerType;
     }
-    if (qobj.positionInfo != 'undefined'){
-        obj["position_info"] = qobj.positionInfo;
+    if (qobj.companyProperties && qobj.companyProperties != 'undefined'){
+      obj.company_info.companyProperties = qobj.companyProperties;
     }
-    if (qobj.regInfo != 'undefined'){
-        obj["file_info"] = qobj.regInfo;
+    if (qobj.addressType && qobj.addressType != 'undefined'){
+      obj.company_info.addressType = pobj.company_info.addressType;
     }
-    if (qobj.expressInfo != 'undefined'){
-        obj["express_info"] = qobj.expressInfo;
+    if (qobj.fullAddress && qobj.fullAddress != 'undefined'){
+      obj.company_info.fullAddress = qobj.fullAddress;
+    }
+    if (pobj.engagedIndustry && pobj.engagedIndustry != 'undefined'){
+      obj.company_info.engagedIndustry = qobj.engagedIndustry;
+    }
+    if (pobj.businessScope && pobj.businessScope != 'undefined'){
+      obj.company_info.businessScope = pobj.businessScope;
+    }
+    if (pobj.operatingPeriod && pobj.operatingPeriod != 'undefined'){
+      obj.company_info.operatingPeriod = pobj.operatingPeriod;
+    }
+    if (pobj.individualType && pobj.individualType != 'undefined'){
+      obj.company_info.individualType = pobj.individualType;
+    }
+    if (pobj.registeredCapital && pobj.registeredCapital != 'undefined'){
+      obj.company_info.registeredCapital = pobj.registeredCapital;
+    }
+    if (pobj.creditCode && pobj.creditCode != 'undefined'){
+      obj.company_info.creditCode = pobj.creditCode;
+    }
+    if (pobj.companyType && pobj.companyType != 'undefined'){
+      obj.company_info.companyType = pobj.companyType;
+    }
+    if (pobj.establishedTime && pobj.establishedTime != 'undefined'){
+      obj.company_info.establishedTime = pobj.establishedTime;
+    }
+    if (pobj.shareholderName && pobj.shareholderName != 'undefined'){
+      obj.company_info.shareholderName = pobj.shareholderName;
+    }
+    if (pobj.registeredCapital && pobj.registeredCapital != 'undefined'){
+      obj.registered_info.registeredCapital = pobj.registeredCapital;
+    }
+    if (pobj.registeredDate && pobj.registeredDate != 'undefined'){
+      obj.registered_info.registeredDate = pobj.registeredDate;
+    }
+    if (pobj.reserveProportion && pobj.reserveProportion != 'undefined'){
+      obj.registered_info.reserveProportion = pobj.reserveProportion;
+    }
+    if (pobj.contributionInfo && pobj.contributionInfo != 'undefined'){
+      obj.contribution_info.contributionInfo = pobj.contributionInfo;
+    }
+    if (pobj.positionInfo && pobj.positionInfo != 'undefined'){
+      obj.position_info.positionInfo = pobj.positionInfo;
+    }
+    if (pobj.managerName && pobj.managerName != 'undefined'){
+      obj.position_info.managerName = pobj.managerName;
+    }
+    if (pobj.managerName && pobj.managerName != 'undefined'){
+      obj.position_info.managerName = pobj.managerName;
+    }
+    if (pobj.IdentificationNumber && pobj.IdentificationNumber != 'undefined'){
+      obj.position_info.IdentificationNumber = pobj.IdentificationNumber;
+    }
+    if (pobj.phoneNumber && pobj.phoneNumber != 'undefined'){
+      obj.position_info.phoneNumber = pobj.phoneNumber;
+    }
+    if (pobj.contactAddress && pobj.contactAddress != 'undefined'){
+      obj.position_info.contactAddress = pobj.contactAddress;
+    }
+    if (pobj.legalpersonCertificate && pobj.legalpersonCertificate != 'undefined'){
+      obj.file_info.legalpersonCertificate = pobj.legalpersonCertificate;
+    }
+    if (pobj.cfoCertificate && pobj.cfoCertificate != 'undefined'){
+      obj.file_info.cfoCertificate = pobj.cfoCertificate;
+    }
+    if (pobj.titleCertificate && pobj.titleCertificate != 'undefined'){
+      obj.file_info.titleCertificate = pobj.titleCertificate;
+    }
+    if (pobj.naturalpersonCertificate && pobj.naturalpersonCertificate != 'undefined'){
+      obj.file_info.naturalpersonCertificate = obj.naturalpersonCertificate;
+    }
+    if (pobj.socialCertificate && pobj.socialCertificate != 'undefined'){
+      obj.file_info.socialCertificate = pobj.socialCertificate;
+    }
+    if (pobj.directorCertificate && pobj.directorCertificate != 'undefined'){
+      obj.file_info.directorCertificate = pobj.directorCertificate;
+    }
+    if (pobj.managerCertificate && pobj.managerCertificate != 'undefined'){
+      obj.file_info.managerCertificate = pobj.managerCertificate;
+    }
+    if (pobj.supervisorCertificate && pobj.supervisorCertificate != 'undefined'){
+      obj.file_info.supervisorCertificate = pobj.supervisorCertificate;
+    }
+    if (pobj.managerCertificate && pobj.managerCertificate != 'undefined'){
+      obj.file_info.managerCertificate = pobj.managerCertificate;
+    }
+    if (pobj.trackingNumber && pobj.trackingNumber != 'undefined'){
+      obj.express_info.trackingNumber = pobj.trackingNumber;
+    }
+    if (pobj.logisticsCompany && pobj.logisticsCompany != 'undefined'){
+      obj.express_info.logisticsCompany = pobj.logisticsCompany;
+    }
+    if (pobj.addresseeName && pobj.addresseeName != 'undefined'){
+      obj.express_info.addresseeName = pobj.addresseeName;
+    }
+    if (pobj.addresseePhone && pobj.addresseePhone != 'undefined'){
+      obj.express_info.addresseePhone = pobj.addresseePhone;
+    }
+    if (pobj.addresseeEmail && pobj.addresseeEmail != 'undefined'){
+      obj.express_info.addresseeEmail = pobj.addresseeEmail;
+    }
+    if (pobj.addresseeAddress && pobj.addresseeAddress != 'undefined'){
+      obj.express_info.addresseeAddress = pobj.addresseeAddress;
+    }
+    if (pobj.expressStatus && pobj.expressStatus != 'undefined'){
+      obj.express_info.expressStatus = pobj.expressStatus;
     }
     return await this.create(obj,t);
   }

ic-deliver/app/base/db/impl/bizchance/schemeDao.js

@@ -23,9 +23,105 @@ class SchemeDao extends Dao {
 
   /*根据方案编号更新方案详情*/
   async updateInfoBySchemeNumber(qobj,t){
-    var setobj = {"scheme_info":qobj.planInfo};
     var whereobj = {"scheme_number":qobj.schemeNumber};
-    return await this.updateByWhere(setobj,whereobj,t);
+    var setobj = await this.findOne(whereobj);
+    if (setobj){
+      if (qobj.businessMode && qobj.businessMode != 'undefined'){
+        setobj.demand_code = qobj.businessMode;
+      }
+      if (qobj.statusReason && qobj.statusReason != 'undefined'){
+        setobj.reject_reason = qobj.statusReason;
+      }
+      if (qobj.memoInfo && qobj.memoInfo != 'undefined'){
+        setobj.remark_info = qobj.memoInfo;
+      }
+      if (qobj.businessId && qobj.businessId != 'undefined'){
+        setobj.bizopt_id = qobj.businessId;
+      }
+      if (qobj.servicerCode && qobj.servicerCode != 'undefined'){
+        setobj.facilitator_id = qobj.servicerCode;
+      }
+      if (qobj.servicerName && qobj.servicerName != 'undefined'){
+        setobj.facilitator_name = qobj.servicerName;
+      }
+      if (qobj.clerkOpcode && qobj.clerkOpcode != 'undefined'){
+        setobj.salesman_opcode = qobj.clerkOpcode;
+      }
+      if (qobj.clerkId && qobj.clerkId != 'undefined'){
+        setobj.salesman_id = qobj.clerkId;
+      }
+      if (qobj.clerkName && qobj.clerkName != 'undefined'){
+        setobj.salesman_name = qobj.clerkName;
+      }
+      if (qobj.clerkPhone && qobj.clerkPhone != 'undefined'){
+        setobj.salesman_phone = qobj.clerkPhone;
+      }
+      if (qobj.taxpayerType && qobj.taxpayerType != 'undefined'){
+        setobj.scheme_info.taxpayerType = qobj.taxpayerType;
+      }
+      if (qobj.registeredType && qobj.registeredType != 'undefined'){
+        setobj.scheme_info.registeredType = qobj.registeredType;
+      }
+      if (qobj.companyProperties && qobj.companyProperties != 'undefined'){
+        setobj.scheme_info.companyProperties = qobj.companyProperties;
+      }
+      if (qobj.engagedIndustry && qobj.engagedIndustry != 'undefined'){
+        setobj.scheme_info.engagedIndustry = qobj.engagedIndustry;
+      }
+      if (qobj.addressType && qobj.addressType != 'undefined'){
+        setobj.scheme_info.addressType = qobj.addressType;
+      }
+      if (qobj.fullAddress && qobj.fullAddress != 'undefined'){
+        setobj.scheme_info.fullAddress = qobj.fullAddress;
+      }
+      if (qobj.businessScope && qobj.businessScope != 'undefined'){
+        setobj.scheme_info.businessScope = qobj.businessScope;
+      }
+      if (qobj.isWhether && qobj.isWhether != 'undefined'){
+        setobj.scheme_info.isWhether = qobj.isWhether;
+      }
+      if (qobj.whetherType && qobj.whetherType != 'undefined'){
+        setobj.scheme_info.whetherType = qobj.whetherType;
+      }
+      if (qobj.subjectType && qobj.subjectType != 'undefined'){
+        setobj.scheme_info.subjectType = qobj.subjectType;
+      }
+      if (qobj.buyTime && qobj.buyTime != 'undefined'){
+        setobj.scheme_info.buyTime = qobj.buyTime;
+      }
+      if (qobj.buyDuration && qobj.buyDuration != 'undefined'){
+        setobj.scheme_info.buyDuration = qobj.buyDuration;
+      }
+      if (qobj.isRenew && qobj.isRenew != 'undefined'){
+        setobj.scheme_info.isRenew = qobj.isRenew;
+      }
+      if (qobj.creditCode && qobj.creditCode != 'undefined'){
+        setobj.scheme_info.creditCode = qobj.creditCode;
+      }
+      if (qobj.companyType && qobj.companyType != 'undefined'){
+        setobj.scheme_info.companyType = qobj.companyType;
+      }
+      if (qobj.establishedTime && qobj.establishedTime != 'undefined'){
+        setobj.scheme_info.establishedTime = qobj.establishedTime;
+      }
+      if (qobj.registeredCapital && qobj.registeredCapital != 'undefined'){
+        setobj.scheme_info.registeredCapital = qobj.registeredCapital;
+      }
+      if (qobj.shareholderName && qobj.shareholderName != 'undefined'){
+        setobj.scheme_info.shareholderName = qobj.shareholderName;
+      }
+      if (qobj.businessTerm && qobj.businessTerm != 'undefined'){
+        setobj.scheme_info.businessTerm = qobj.businessTerm;
+      }
+      if (qobj.residenceAddress && qobj.residenceAddress != 'undefined'){
+        setobj.scheme_info.residenceAddress = qobj.residenceAddress;
+      }
+      return await this.updateByWhere(setobj,whereobj,t);
+    }
+    else{
+      return -1;
+    }
+    
   }
 
   /*根据商机编号更新方案编号*/
@@ -38,40 +134,111 @@ class SchemeDao extends Dao {
   /*插入方案信息*/
   async insertInfo(qobj,t){
     var obj = {
-        "demand_code":qobj.businessMode,
-        "scheme_info":qobj.planInfo,
-        "scheme_status":qobj.currentStatus
+        "demand_code":qobj.businessMode   
     };
+    if (qobj.currentStatus && qobj.currentStatus != 'undefined'){
+      obj["scheme_status"] = qobj.currentStatus;
+    }
     if (qobj.schemeNumber && qobj.schemeNumber != 'undefined'){
-        obj["scheme_number"] = qobj.schemeNumber;
+      obj["scheme_number"] = qobj.schemeNumber;
     }
     if (qobj.statusReason && qobj.statusReason != 'undefined'){
-        obj["reject_reason"] = qobj.statusReason;
+      obj["reject_reason"] = qobj.statusReason;
     }
     if (qobj.memoInfo && qobj.memoInfo != 'undefined'){
-        obj["remark_info"] = qobj.memoInfo;
+      obj["remark_info"] = qobj.memoInfo;
     }
     if (qobj.businessId && qobj.businessId != 'undefined'){
-        obj["bizopt_id"] = qobj.businessId;
+      obj["bizopt_id"] = qobj.businessId;
     }
     if (qobj.servicerCode && qobj.servicerCode != 'undefined'){
-        obj["facilitator_id"] = qobj.servicerCode;
+      obj["facilitator_id"] = qobj.servicerCode;
     }
     if (qobj.servicerName && qobj.servicerName != 'undefined'){
-        obj["facilitator_name"] = qobj.servicerName;
+      obj["facilitator_name"] = qobj.servicerName;
     }
     if (qobj.clerkOpcode && qobj.clerkOpcode != 'undefined'){
-        obj["salesman_opcode"] = qobj.clerkOpcode;
+      obj["salesman_opcode"] = qobj.clerkOpcode;
     }
     if (qobj.clerkId && qobj.clerkId != 'undefined'){
-        obj["salesman_id"] = qobj.clerkId;
+      obj["salesman_id"] = qobj.clerkId;
     }
     if (qobj.clerkName && qobj.clerkName != 'undefined'){
-        obj["salesman_name"] = qobj.clerkName;
+      obj["salesman_name"] = qobj.clerkName;
     }
     if (qobj.clerkPhone && qobj.clerkPhone != 'undefined'){
-        obj["salesman_phone"] = qobj.clerkPhone;
+      obj["salesman_phone"] = qobj.clerkPhone;
+    }
+    var scheme_info = {};
+    if (qobj.companyName && qobj.companyName != 'undefined'){
+      scheme_info.companyName = qobj.companyName;
+    }
+    if (qobj.taxpayerType && qobj.taxpayerType != 'undefined'){
+      scheme_info.taxpayerType = qobj.taxpayerType;
+    }
+    if (qobj.registeredType && qobj.registeredType != 'undefined'){
+      scheme_info.registeredType = qobj.registeredType;
+    }
+    if (qobj.companyProperties && qobj.companyProperties != 'undefined'){
+      scheme_info.companyProperties = qobj.companyProperties;
+    }
+    if (qobj.engagedIndustry && qobj.engagedIndustry != 'undefined'){
+      scheme_info.engagedIndustry = qobj.engagedIndustry;
+    }
+    if (qobj.addressType && qobj.addressType != 'undefined'){
+      scheme_info.addressType = qobj.addressType;
+    }
+    if (qobj.fullAddress && qobj.fullAddress != 'undefined'){
+      scheme_info.fullAddress = qobj.fullAddress;
+    }
+    if (qobj.businessScope && qobj.businessScope != 'undefined'){
+      scheme_info.businessScope = qobj.businessScope;
+    }
+    if (qobj.isWhether && qobj.isWhether != 'undefined'){
+      scheme_info.isWhether = qobj.isWhether;
+    }
+    if (qobj.whetherType && qobj.whetherType != 'undefined'){
+      scheme_info.whetherType = qobj.whetherType;
     }
+    if (qobj.subjectType && qobj.subjectType != 'undefined'){
+      scheme_info.subjectType = qobj.subjectType;
+    }
+    if (qobj.buyTime && qobj.buyTime != 'undefined'){
+      scheme_info.buyTime = qobj.buyTime;
+    }
+    if (qobj.buyDuration && qobj.buyDuration != 'undefined'){
+      scheme_info.buyDuration = qobj.buyDuration;
+    }
+    if (qobj.isRenew && qobj.isRenew != 'undefined'){
+      scheme_info.isRenew = qobj.isRenew;
+    }
+    if (qobj.creditCode && qobj.creditCode != 'undefined'){
+      scheme_info.creditCode = qobj.creditCode;
+    }
+    if (qobj.companyType && qobj.companyType != 'undefined'){
+      scheme_info.companyType = qobj.companyType;
+    }
+    if (qobj.establishedTime && qobj.establishedTime != 'undefined'){
+      scheme_info.establishedTime = qobj.establishedTime;
+    }
+    if (qobj.registeredCapital && qobj.registeredCapital != 'undefined'){
+      scheme_info.registeredCapital = qobj.registeredCapital;
+    }
+    if (qobj.shareholderName && qobj.shareholderName != 'undefined'){
+      scheme_info.shareholderName = qobj.shareholderName;
+    }
+    if (qobj.businessTerm && qobj.businessTerm != 'undefined'){
+      scheme_info.businessTerm = qobj.businessTerm;
+    }
+    if (qobj.residenceAddress && qobj.residenceAddress != 'undefined'){
+      scheme_info.residenceAddress = qobj.residenceAddress;
+    }
+    obj["scheme_info"] = scheme_info;
+
+    // console.log("SSSSSSSSSSSSSSSSSSSSSS");
+    // console.log(obj);
+    // console.log("SSSSSSSSSSSSSSSSSSSSSS");
+
     return await this.create(obj,t);
   }
 

ic-deliver/app/base/db/metadata/app/platform.js

@@ -14,11 +14,12 @@ module.exports = {
             "node_type":{"org":"组织","arc":"文档"},
             "source": {//渠道来源
                 "tencentCloud": "腾讯云"
-            },
+            },             
             "businessType": {//商机类型
                 "companyCase": "公司注册",
-                "psCase": "个体户注册",
-                "soleCase": "个人独资企业注册",
+                "psCase":"园区注册",
+                // "psCase": "个体户注册",
+                // "soleCase": "个人独资企业注册",
                 "agentCase": "代理记账",
                 "regAddrCase": "注册地址",
                 "icCheckCase": "工商年报",

ic-deliver/app/base/service/impl/bizchance/deliverybillSve.js

@@ -25,5 +25,13 @@ class DeliverybillService extends ServiceBase {
         });
     }
 
+    /*插入交付单信息*/
+    async insertInfo(qobj){
+        var self=this;
+        return self.db.transaction(async function (t) {
+            return await self.dao.insertInfo(qobj,t);
+        }); 
+    }
+
 }
 module.exports = DeliverybillService;
\ No newline at end of file

ic-deliver/app/base/service/impl/bizchance/materialSve.js

@@ -12,7 +12,7 @@ class MaterialService extends ServiceBase {
     //     return apps;
     // }
 
-    /*根据交付单id获取缓存详情*/
+    /*根据交付单id获取注册材料信息详情*/
     async findInfoByDeliverId(qobj){
         return await this.dao.findInfoByDeliverId(qobj);
     }

ic-deliver/app/base/utils/execClient.js

@@ -30,6 +30,7 @@ class ExecClient {
 
     async execPost(subData, url) {
         let cmd = this.FetchPostCmd(subData, url);
+        console.log("__________________" + cmd);
         var result = await this.exec(cmd);
         return result;
     }