gyq

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

@@ -22,13 +22,13 @@ class DeliverybillCtl extends CtlBase {
       results.forEach(element => {
         let robj = {};
         robj.id = element.id;//数据的id
-        robj.deliverNumber = element.deliver_code;//交付单编号
+        robj.deliverNumber = element.delivery_code;//交付单编号
         robj.businessName = element.product_name;//产品名称
         robj.businessType = element.product_code;//产品编码
-        robj.channelSource = element.source_name;//渠道名称
+        robj.sourceName = element.source_name;//渠道来源
         robj.channelNumber = element.source_number;//渠道编码
         robj.baseInfo = element.delivery_info;//交付单详情
-        if (robj.businessName == '工商注册'){
+        if (robj.businessName == '公司注册'){
           if (robj.baseInfo.isWhether == "是" || robj.baseInfo.isVirtual == "是"){//如果有刻章需求或者是虚拟地址
             robj.relatedProducts = '有';
           }
@@ -36,7 +36,7 @@ class DeliverybillCtl extends CtlBase {
             robj.relatedProducts = '无';
           }
         }
-        else if (robj.businessName == '园区注册'){
+        else if (robj.businessName == '云上园区注册'){
           if (robj.baseInfo.isWhether == "是"){//如果有刻章需求或者是虚拟地址
             robj.relatedProducts = '有';
           }
@@ -51,7 +51,7 @@ class DeliverybillCtl extends CtlBase {
         robj.deliverStatus = element.delivery_status;//交付单状态
         robj.contactsName = robj.baseInfo.contactsName;//联系人
         robj.contactsPhone = robj.baseInfo.contactsPhone;//联系电话
-        robj.CrteatdTime = this.timeFormat(element.created_at);//交付单创建时间
+        robj.createdTime = this.timeFormat(element.created_at);//交付单创建时间
         rarr.push(robj);
       });
       rs.results.rows = rarr;
@@ -251,12 +251,6 @@ class DeliverybillCtl extends CtlBase {
     if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.schemeNumber && pobj.schemeNumber != 'undefined'){
       try{
         var res = await this.service.insertInfo(pobj);
-        var mobj = pobj;
-        mobj.deliverId = res.id;
-        if (res.delivery_code){
-          mobj.deliverNumber = res.delivery_code;
-        }
-        await this.materialService.insertInfo(mobj);
         return system.getResult("插入成功！");
       }
       catch (error){

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

@@ -230,8 +230,10 @@ class SchemeCtl extends CtlBase {
 
   /*插入方案信息*/
   async insertInfo(pobj, qobj, req){
-    if (pobj.businessMode && pobj.businessMode != 'undefined'){//商机编号必须存在
+    if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.currentStatus && pobj.currentStatus != 'undefined' 
+        && pobj.baseInfo && pobj.baseInfo != 'undefined'){//商机编号必须存在
         try{
+            await this.bizoptService.updateStatusBySchemeNumber(pobj);//修改商机状态
             var businessInfo = await this.bizoptService.findInfoByDemandCode(pobj);//得到商机的信息
             if (businessInfo){
                 pobj.businessId = businessInfo.id;//商机id
@@ -245,6 +247,8 @@ class SchemeCtl extends CtlBase {
                 pobj.currentStatus = businessInfo.business_status;//商机状态即为方案状态
                 pobj.statusReason = businessInfo.close_reason;//状态原因
             }
+            var mobj = pobj;
+            mobj.businessType = appconfig.pdict.fdyDict[pobj.businessType];
             var rc = system.getObject("util.execClient");
             var requrl = this.receiveUrl;
             var params =  {
@@ -252,7 +256,7 @@ class SchemeCtl extends CtlBase {
                 "actionBody":{
                     "needNum": pobj.businessMode,
                     "solutionNum":"",
-                    "solutionContent": pobj
+                    "solutionContent": mobj
                 }
             }   
             var rtn = await rc.execPost(params, requrl);

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

@@ -134,7 +134,8 @@ class SchemeDao extends Dao {
   /*插入方案信息*/
   async insertInfo(qobj,t){
     var obj = {
-        "demand_code":qobj.businessMode   
+      "demand_code":qobj.businessMode,
+      "scheme_info":qobj.baseInfo
     };
     if (qobj.currentStatus && qobj.currentStatus != 'undefined'){
       obj["scheme_status"] = qobj.currentStatus;
@@ -169,76 +170,6 @@ class SchemeDao extends Dao {
     if (qobj.clerkPhone && qobj.clerkPhone != 'undefined'){
       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

@@ -37,6 +37,21 @@ module.exports = {
                 "isexpired":"已到期",// 注册地址和代理记账
                 "isClosed": "已关闭"
             },
+            "deliverStatus": {//交付单状态
+                "received":"已接单",//接单日期，公司注册云上园区
+                "collecting":"收集工商注册材料",//请配合顾问尽快提供，公司注册
+                "uploading":"上传注册材料",//请配合顾问尽快提供,云上园区注册
+                "checking":"园区入驻审核",//1个工作日完成，云上园区注册
+                "auditing":"工商审核环节",//10个工作日内，公司注册、云上园区
+                "engraving":"刻章环节",//5个工作日内，只有选择了刻章服务时才有该状态
+                "posting":"证件邮寄环节",//3个工作日内，公司注册、云上园区
+                "paid":"已付款",//增值服务
+                "inservice":"服务中",//增值服务
+                "completed":"已完成",//税务报道、税控申请、银行开户、工商年报、工商变更、社保开户、刻章服务
+                "signed":"已签收",//公司注册、云上园区
+                "expired":"已到期",//代理记账、注册地址
+                "closed":"关闭交付"//只有在已接单和收集工商注册材料阶段才能关闭交付
+            },
             "diliverStatus1": {//公司注册交付单状态
                 "received":"已接单",//接单日期
                 "collecting":"收集工商注册材料",//请配合顾问尽快提供
@@ -139,6 +154,32 @@ module.exports = {
             "agentTypeDict": {//代理记账主体类型
                 "company": "公司",
                 "individual ": "个体户" 
+            },
+            "dyDict":{//产品对应关系
+                "/ic/gsreg/":"companyCase",
+                "/ic/kzfw/":"sealSevCase",
+                "/ic/cpreg/":"psCase",
+                "/ic/bankopen/":"openBankAccountCase",
+                "/ic/swbd/":"taxCase",
+                "/ic/sksq/":"taxControlCase",
+                "/ic/dljz/":"agentCase",
+                "/ic/regaddr/":"regAddrCase",
+                "/ic/gsnj/":"icCheckCase",
+                "/ic/gschangs/":"icChangeCase",
+                "/ic/sbopen/":"ssOpenCase"
+            },
+            "fdyDict":{//产品反对应关系
+                "companyCase":"/ic/gsreg/",
+                "sealSevCase":"/ic/kzfw/",
+                "psCase":"/ic/cpreg/",
+                "openBankAccountCase":"/ic/bankopen/",
+                "taxCase":"/ic/swbd/",
+                "taxControlCase":"/ic/sksq/",
+                "agentCase":"/ic/dljz/",
+                "regAddrCase":"/ic/regaddr/",
+                "icCheckCase":"/ic/gsnj/",
+                "icChangeCase":"/ic/gschangs/",
+                "ssOpenCase":"/ic/sbopen/"
             }
         }
     }