gyq

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

@@ -50,25 +50,28 @@ class BizOptCtl extends CtlBase {
         var rarr = {}
         if (rs){
           var statusInfo = {"currentStatus":rs.business_status};//商机状态
-          var bussinessInfo = {};
-          bussinessInfo.businessMode = rs.demand_code;//商机编号
-          bussinessInfo.channelSource = rs.source_name;//渠道来源
-          bussinessInfo.businessType = rs.business_type;//商机类型代码
-          bussinessInfo.businessName = appconfig.pdict.businessType[rarr.businessType];//商机类型名称
-          bussinessInfo.serviceCode = rs.service_address;//服务地区
-          if (bussinessInfo.businessName == "云上园区注册"){
-            bussinessInfo.serviceName = appconfig.pdict.registeredParkDict[bussinessInfo.serviceCode];//服务地区名称
+          var businessInfo = {};
+          businessInfo.businessMode = rs.demand_code;//商机编号
+          businessInfo.channelSource = appconfig.pdict.source[rs.source_name];///渠道来源
+         // businessInfo.businessType = rs.business_type;//商机类型代码
+          businessInfo.businessType = appconfig.pdict.businessType[rs.business_type];//商机类型名称
+         // businessInfo.serviceArea = rs.service_address;//服务地区
+          if (businessInfo.businessName == "云上园区注册"){
+            businessInfo.serviceArea = appconfig.pdict.registeredParkDict[rs.service_address];//服务地区名称
           }
           else{
-            bussinessInfo.serviceName = appconfig.pdict.registeredAreaDict[bussinessInfo.serviceCode];//服务地区名称
+            businessInfo.serviceArea = appconfig.pdict.registeredAreaDict[rs.service_address];//服务地区名称
           }
-          bussinessInfo.statusReason = rs.close_reason;//商机关闭原因
-          bussinessInfo.memoInfo = rs.business_info.memoInfo;//备注信息
-          bussinessInfo.contactsName = rs.business_info.contactsName;//联系人名称
-          bussinessInfo.contactsPhone = rs.business_info.contactsPhone;//联系人联系方式
-          bussinessInfo.createdTime =  this.timeFormat(rs.created_at);//商机创建时间
+          if (businessInfo.businessName == "注册地址"){
+            businessInfo.registeredAddress = appconfig.pdict.registeredAreaDict[rs.service_address];//注册地址名称
+          }
+          businessInfo.statusReason = rs.close_reason;//商机关闭原因
+          businessInfo.memoInfo = rs.business_info.memoInfo;//备注信息
+          businessInfo.contactsName = rs.business_info.contactsName;//联系人名称
+          businessInfo.contactsPhone = rs.business_info.contactsPhone;//联系人联系方式
+          businessInfo.createdTime =  this.timeFormat(rs.created_at);//商机创建时间
           rarr.statusInfo = statusInfo;
-          rarr.bussinessInfo = bussinessInfo;
+          rarr.businessInfo = businessInfo;
         }
         if (ms){
           var planInfo = ms.scheme_info;

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

@@ -24,7 +24,7 @@ class SchemeDao extends Dao {
   /*根据商机编号更新方案详情*/
   async updateInfoByDemandCode(qobj,t){
     var whereobj = {"demand_code":qobj.businessMode};
-    var setobj = {"scheme_info":qobj.planInfo,"scheme_status":qobj.currentStatus};
+    var setobj = {"scheme_info":qobj.baseInfo,"scheme_status":qobj.currentStatus};
     return await this.updateByWhere(setobj,whereobj,t);  
   }
 

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

@@ -113,7 +113,7 @@ module.exports = {
             },
             "TaxpayerTypeDict": {//纳税人类型
                 "smallScaleTaxpayer": "小规模纳税人",
-                "generalTaxpayer": "一般纳税人人"
+                "generalTaxpayer": "一般纳税人"
             },
             "companyNatureDict": {//公司类型
                 "limitedLiabilityCompany": "有限责任公司",
@@ -159,6 +159,12 @@ module.exports = {
                 "company": "公司",
                 "individual": "个体户" 
             },
+            "buyDurationDict": {//购买时长
+                "buyDuration": "1年",
+            },
+            "isRenewDict": {//是否自动续费
+                "isRenew": "开启",
+            },
             "dyDict":{//产品对应关系
                 "/ic/gsreg/":"companyCase",
                 "/ic/kzfw/":"sealSevCase",
@@ -168,7 +174,7 @@ module.exports = {
                 "/ic/sksq/":"taxControlCase",
                 "/ic/dljz/":"agentCase",
                 "/ic/regaddr/":"regAddrCase",
-                "/ic/gsnj/":"icCheckCase",
+                "/ic/gsnb/":"icCheckCase",
                 "/ic/gschangs/":"icChangeCase",
                 "/ic/sbopen/":"ssOpenCase"
             },
@@ -181,7 +187,7 @@ module.exports = {
                 "taxControlCase":"/ic/sksq/",
                 "agentCase":"/ic/dljz/",
                 "regAddrCase":"/ic/regaddr/",
-                "icCheckCase":"/ic/gsnj/",
+                "icCheckCase":"/ic/gsnb/",
                 "icChangeCase":"/ic/gschangs/",
                 "ssOpenCase":"/ic/sbopen/"
             },