Skip to content

Z
zhichan
Commit 3b7a4952 by 高宇强
Options

Merge branch 'ic-deliver' of gitlab.gongsibao.com:jiangyong/zhichan into ic-deliver

parents c67ad416 6bca5559
Showing with 295 additions and 142 deletions
ic-deliver/app/base/controller/impl/bizchance/bizoptCtl.js
......@@ -50,36 +50,41 @@ 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);//商机创建时间
rarr.push(statusInfo);
rarr.push(bussinessInfo);
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.businessInfo = businessInfo;
}
if (ms){
var planInfo = ms.scheme_info;
planInfo.schemeNumber = ms.scheme_number;
planInfo.currentStatus = ms.scheme_status;
planInfo.statusReason = ms.reject_reason;
rarr.push(planInfo);
rarr.planInfo = planInfo;
}
return system.getResult(rarr);
}
catch(error){
console.log("eeeeeeeeeeeeeeeeeeeeee");
console.log(error);
return system.getResultError(error);
}
}
......
ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
......@@ -134,30 +134,34 @@ class DeliverybillCtl extends CtlBase {
}
}
async UpdateofficialSealByDeliverCode(pobj,qobj,req){//
if ((pobj.deliverNumber && pobj.deliverNumber != 'undefined' && ((pobj.baseInfo.officialSeal && pobj.baseInfo.officialSeal != 'undefined') || (pobj.baseInfo.businessLicense && pobj.baseInfo.businessLicense != 'undefined')))){
var rs = await this.service.findInfoByDeliverCode(pobj)//先得到交付单详情
if (pobj.baseInfo.officialSeal && pobj.baseInfo.officialSeal != 'undefined'){
rs.delivery_info.officialSeal = pobj.baseInfo.officialSeal;
}
if (pobj.baseInfo.businessLicense && pobj.baseInfo.businessLicense != 'undefined'){
rs.delivery_info.businessLicense = pobj.baseInfo.businessLicense;
}
//更新详情
var uarr = {
"deliverNumber":pobj.deliverNumber,
"baseInfo":rs.delivery_info
};
await this.service.updateInfoByDeliverCode(uarr);
return system.getResult("更新成功");
}
else{
return system.getResultError("参数错误！");
}
}
/*根据交付单编号更新交付单详情*/
async updateInfoByDeliverCode(pobj,qobj,req){//
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined'){
try{
//判断工商扫描件和营业执照扫描件是否存在,若存在更新交付单的详情
if ((pobj.baseInfo.officialSeal && pobj.baseInfo.officialSeal != 'undefined') || (pobj.baseInfo.businessLicense && pobj.baseInfo.businessLicense != 'undefined')){
var rs = await this.service.findInfoByDeliverCode(pobj)//先得到交付单详情
var deliveryInfo = rs.delivery_info;
if (pobj.baseInfo.officialSeal && pobj.baseInfo.officialSeal != 'undefined'){
deliveryInfo.officialSeal = pobj.baseInfo.officialSeal;
}
if (pobj.baseInfo.businessLicense && pobj.baseInfo.businessLicense != 'undefined'){
deliveryInfo.businessLicense = pobj.baseInfo.businessLicense;
}
//更新详情
var uarr = {
"deliverNumber":pobj.deliverNumber,
"deliveryInfo":deliveryInfo
};
await this.service.updateInfoByDeliverCode(uarr);
}
//更新详情
await this.service.updateInfoByDeliverCode(pobj);
//更新材料信息
await this.materialService.updateInfoByDeliverNumber(pobj);
var statusInfo = {
......@@ -213,7 +217,7 @@ class DeliverybillCtl extends CtlBase {
"actionType":"updateOrderStatus",
"actionBody":{
"orderNum": pobj.businessMode,//订单编码
"status":2,//已接单
"status":20,//已接单
"deliverContent":pobj
}
}
......
ic-deliver/app/base/controller/impl/bizchance/schemeCtl.js
......@@ -121,48 +121,7 @@ class SchemeCtl extends CtlBase {
rarr.clerkPhone = rs.salesman_phone;//业务员联系方式
rarr.createdTime = this.timeFormat(rs.created_at);//创建方案的日期
rarr.statusTime = this.timeFormat(rs.updated_at);//当前状态的日期
var baseInfo = {};
if (rarr.businessName == "公司注册" || rarr.businessName == "园区注册"
|| rarr.businessName == "税控申请" || rarr.businessName == "代理记账"){
baseInfo.taxpayerType = rs.scheme_info.taxpayerType;
}
if (rarr.businessName == "园区注册"){
baseInfo.registeredType = rs.scheme_info.registeredType;
}
if (rarr.businessName == "公司注册" || rarr.businessName == "园区注册"){
if (rarr.businessName == "公司注册"){
baseInfo.companyProperties = rs.scheme_info.companyProperties;
}
baseInfo.engagedIndustry = rs.scheme_info.engagedIndustry;
baseInfo.addressType = rs.scheme_info.addressType;
baseInfo.fullAddress = rs.scheme_info.fullAddress;
baseInfo.businessScope = rs.scheme_info.businessScope;
baseInfo.isWhether = rs.scheme_info.isWhether;
}
if (rarr.businessName == "刻章服务"){
baseInfo.whetherType = rs.scheme_info.whetherType;
}
if (rarr.businessName == "代理记账"){
baseInfo.subjectType = rs.scheme_info.subjectType;
}
if (rarr.businessName == "注册地址" || rarr.businessName == "代理记账"){
baseInfo.buyTime = rs.scheme_info.buyTime;
baseInfo.buyDuration = rs.scheme_info.buyDuration;
baseInfo.isRenew = rs.scheme_info.isRenew;
}
rarr.baseInfo = baseInfo;
if (rarr.businessName != "公司注册" && rarr.businessName != "园区注册"){
var companyInfo = {};
companyInfo.creditCode = rs.scheme_info.creditCode;
companyInfo.companyType = rs.scheme_info.companyType;
companyInfo.establishedTime = rs.scheme_info.establishedTime;
companyInfo.registeredCapital =rs.scheme_info.registeredCapital;
companyInfo.shareholderName = rs.scheme_info.shareholderName;
companyInfo.businessTerm = rs.scheme_info.businessTerm;
companyInfo.businessScope = rs.scheme_info.businessScope;
companyInfo.residenceAddress = rs.scheme_info.residenceAddress;
rarr.companyInfo = companyInfo;
}
rarr.baseInfo = rs.scheme_info;
}
return system.getResult(rarr);
}
......@@ -193,92 +152,119 @@ class SchemeCtl extends CtlBase {
/*根据商机编号更新方案详情*/
async updateInfoByDemandCode(pobj, qobj, req){
if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.schemeNumber && schemeNumber != 'undefined'
&& pobj.planInfo && pobj.planInfo != 'undefined'){
if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.schemeNumber && pobj.schemeNumber != 'undefined'
&& pobj.baseInfo && pobj.baseInfo != 'undefined'){
try{
pobj.currentStatus = "beforeConfirmation";//同时把方案的状态也更新为待确认
if (pobj.planInfo.caseRemarks && pobj.planInfo.caseRemarks != 'undefined'){
pobj.planInfo.memoInfo = pobj.planInfo.caseRemarks;//备注信息
var businessInfo = await this.bizoptService.findInfoByDemandCode(pobj);//得到商机的信息，插入方案表时要用到
if (businessInfo){
pobj.businessId = businessInfo.id;//商机id
pobj.businessType = businessInfo.business_type;//商机类型
pobj.servicerCode = businessInfo.facilitator_id;//服务商id
pobj.servicerName = businessInfo.facilitator_name;//服务商的名称
pobj.clerkOpcode = businessInfo.salesman_opcode;//这个信息需要确认
pobj.clerkId = businessInfo.salesman_id;//业务员id
pobj.clerkName = businessInfo.salesman_name;//业务员名称
pobj.clerkPhone = businessInfo.salesman_phone;//业务员联系电话
//pobj.currentStatus = appconfig.pdict.businessStatus[businessInfo.business_status];//商机状态即为方案状态
//pobj.statusReason = businessInfo.close_reason;//状态原因
}
if (pobj.planInfo.cmpName && pobj.planInfo.cmpName != 'undefined'){
pobj.planInfo.companyName = pobj.planInfo.cmpName;//公司名称
if (pobj.baseInfo.caseRemarks && pobj.baseInfo.caseRemarks != 'undefined'){
pobj.baseInfo.memoInfo = pobj.baseInfo.caseRemarks;//备注信息
}
if (pobj.baseInfo.cmpName && pobj.baseInfo.cmpName != 'undefined'){
pobj.baseInfo.companyName = pobj.baseInfo.cmpName;//公司名称
}
//是否刻章
if (pobj.planInfo.cmpSealSevCase && pobj.planInfo.cmpSealSevCase != 'undefined'){
pobj.planInfo.isWhether = pobj.planInfo.cmpSealSevCase;
if (pobj.baseInfo.cmpSealSevCase && pobj.baseInfo.cmpSealSevCase != 'undefined'){
pobj.baseInfo.isWhether = pobj.baseInfo.cmpSealSevCase;
}
if (pobj.planInfo.psSealSevCase && pobj.planInfo.psSealSevCase != 'undefined'){
pobj.planInfo.isWhether = pobj.planInfo.psSealSevCase
if (pobj.baseInfo.psSealSevCase && pobj.baseInfo.psSealSevCase != 'undefined'){
pobj.baseInfo.isWhether = pobj.baseInfo.psSealSevCase
}
//纳税人类型
if (pobj.planInfo.psTaxpayerType && pobj.planInfo.psTaxpayerType != 'undefined'){
pobj.planInfo.taxPayerType = pobj.planInfo.psTaxpayerType;
if (pobj.baseInfo.psTaxpayerType && pobj.baseInfo.psTaxpayerType != 'undefined'){
pobj.baseInfo.taxpayerType = pobj.baseInfo.taxpayerType;
}
if (pobj.planInfo.cmpTaxPayerType && pobj.planInfo.cmpTaxPayerType != 'undefined'){
pobj.planInfo.taxPayerType = pobj.planInfo.cmpTaxPayerType;
if (pobj.baseInfo.cmpTaxPayerType && pobj.baseInfo.cmpTaxPayerType != 'undefined'){
pobj.baseInfo.taxpayerType = pobj.baseInfo.taxpayerType;
}
if (pobj.planInfo.agentTaxpayerType && pobj.planInfo.agentTaxpayerType != 'undefined'){
pobj.planInfo.taxpayerType = pobj.planInfo.agentTaxpayerType;
if (pobj.baseInfo.agentTaxpayerType && pobj.baseInfo.agentTaxpayerType != 'undefined'){
pobj.baseInfo.taxpayerType = pobj.baseInfo.agentTaxpayerType;
}
//详细地址
if (pobj.planInfo.addressTypeInput && pobj.planInfo.addressTypeInput != 'undefined'){
pobj.planInfo.residenceAddress = pobj.planInfo.addressTypeInput;
if (pobj.baseInfo.addressTypeInput && pobj.baseInfo.addressTypeInput != 'undefined'){
pobj.baseInfo.residenceAddress = pobj.baseInfo.addressTypeInput;
}
if (pobj.planInfo.addressType && pobj.planInfo.addressType != 'undefined'){//地址类型
pobj.planInfo.addressTypeName = appconfig.pdict.addressTypeDict[pobj.planInfo.addressType];//地址类型名称
if (pobj.baseInfo.addressType && pobj.baseInfo.addressType != 'undefined'){//地址类型
pobj.baseInfo.addressTypeName = appconfig.pdict.addressTypeDict[pobj.baseInfo.addressType];//地址类型名称
}
if (pobj.planInfo.TaxPayerType && pobj.planInfo.TaxPayerType != 'undefined'){
pobj.planInfo.TaxPayerName = appconfig.pdict.TaxpayerTypeDict[pobj.planInfo.TaxPayerType];//纳税人名称
if (pobj.baseInfo.taxpayerType && pobj.baseInfo.taxpayerType != 'undefined'){
pobj.baseInfo.taxpayerName = appconfig.pdict.TaxpayerTypeDict[pobj.baseInfo.taxpayerType];//纳税人名称
}
if (pobj.planInfo.registeredType && pobj.planInfo.registeredType != 'undefined'){
pobj.planInfo.registeredName = appconfig.pdict.registeredTypeDict[pobj.planInfo.registeredType];//云上园区名称
if (pobj.baseInfo.registeredType && pobj.baseInfo.registeredType != 'undefined'){
pobj.baseInfo.registeredName = appconfig.pdict.registeredTypeDict[pobj.baseInfo.registeredType];//云上园区名称
}
if (pobj.planInfo.agentType && pobj.planInfo.agentType != 'undefined'){
pobj.planInfo.agentName = appconfig.pdict.agentTypeDict[pobj.planInfo.agentType];//代理记账主体名称
if (pobj.planInfo.serviceArea && pobj.planInfo.serviceArea != 'undefined'){
if (pobj.planInfo.agentType == "company"){
pobj.planInfo.serviceAreaName = appconfig.pdict.registeredAreaDict[pobj.planInfo.serviceArea];//注册地区
if (pobj.baseInfo.agentType && pobj.baseInfo.agentType != 'undefined'){
pobj.baseInfo.agentName = appconfig.pdict.agentTypeDict[pobj.baseInfo.agentType];//代理记账主体名称
if (pobj.baseInfo.serviceArea && pobj.baseInfo.serviceArea != 'undefined'){
if (pobj.baseInfo.agentType == "company"){
pobj.baseInfo.serviceAreaName = appconfig.pdict.registeredAreaDict[pobj.baseInfo.serviceArea];//注册地区
}
else{
pobj.planInfo.serviceAreaName = appconfig.pdict.registeredParkDict[pobj.planInfo.serviceArea];//注册地区
pobj.baseInfo.serviceAreaName = appconfig.pdict.registeredParkDict[pobj.baseInfo.serviceArea];//注册地区
}
}
}
if (pobj.businessType == "companyCase"){
if (pobj.planInfo.companynature && pobj.planInfo.companynature != 'undefined'){
pobj.planInfo.companyType = appconfig.pdict.companyNatureDict[pobj.planInfo.companynature];//公司类型的名称
if (pobj.baseInfo.companynature && pobj.baseInfo.companynature != 'undefined'){
pobj.baseInfo.companyType = appconfig.pdict.companyNatureDict[pobj.baseInfo.companynature];//公司类型的名称
}
//注册地区
if (pobj.planInfo.serviceArea && pobj.planInfo.serviceArea != 'undefined'){
pobj.planInfo.serviceAreaName = appconfig.pdict.registeredAreaDict[pobj.planInfo.serviceArea];//注册地区
if (pobj.baseInfo.serviceArea && pobj.baseInfo.serviceArea != 'undefined'){
pobj.baseInfo.serviceAreaName = appconfig.pdict.registeredAreaDict[pobj.baseInfo.serviceArea];//注册地区
}
}
else if (pobj.businessType == "psCase"){
//注册地区
if (pobj.planInfo.serviceArea && pobj.planInfo.serviceArea != 'undefined'){
pobj.planInfo.serviceAreaName = appconfig.pdict.registeredParkDict[pobj.planInfo.serviceArea];//注册地区
if (pobj.baseInfo.serviceArea && pobj.baseInfo.serviceArea != 'undefined'){
pobj.baseInfo.serviceAreaName = appconfig.pdict.registeredParkDict[pobj.baseInfo.serviceArea];//注册地区
}
}
else{
//注册地区
if (pobj.baseInfo.serviceArea && pobj.baseInfo.serviceArea != 'undefined'){
pobj.baseInfo.serviceAreaName = appconfig.pdict.registeredAreaDict[pobj.baseInfo.serviceArea];//注册地区
}
}
if (pobj.planInfo.engagedIndustry && pobj.planInfo.engagedIndustry != 'undefined'){
pobj.planInfo.engagedIndName = appconfig.pdict.engagedIndustryDict[pobj.planInfo.engagedIndustry];//从事行业名称
}
if (pobj.planInfo.sealSevType && pobj.planInfo.sealSevType != 'undefined'){
pobj.planInfo.sealSevName = appconfig.pdict.sealSevTypeDict[pobj.planInfo.sealSevType];//刻章类型名称名称
if (pobj.planInfo.serviceArea && pobj.planInfo.serviceArea != 'undefined'){
if (pobj.planInfo.sealSevType == "company"){
pobj.planInfo.serviceAreaName = appconfig.pdict.registeredAreaDict[pobj.planInfo.serviceArea];//注册地区
//goumaisichang
if (pobj.baseInfo.buyDuration && pobj.baseInfo.buyDuration != 'undefined'){
pobj.baseInfo.buyDuration = appconfig.pdict.buyDurationDict[pobj.baseInfo.buyDuration];
}
if (pobj.baseInfo.isRenew ){
pobj.baseInfo.isRenew = appconfig.pdict.isRenewDict[pobj.baseInfo.isRenew];
}
else{
pobj.baseInfo.isRenew = "不开启"
}
if (pobj.baseInfo.engagedIndustry && pobj.baseInfo.engagedIndustry != 'undefined'){
pobj.baseInfo.engagedIndName = appconfig.pdict.engagedIndustryDict[pobj.baseInfo.engagedIndustry];//从事行业名称
}
if (pobj.baseInfo.sealSevType && pobj.baseInfo.sealSevType != 'undefined'){
pobj.baseInfo.sealSevName = appconfig.pdict.sealSevTypeDict[pobj.baseInfo.sealSevType];//刻章类型名称名称
if (pobj.baseInfo.serviceArea && pobj.baseInfo.serviceArea != 'undefined'){
if (pobj.baseInfo.sealSevType == "company"){
pobj.baseInfo.serviceAreaName = appconfig.pdict.registeredAreaDict[pobj.baseInfo.serviceArea];//注册地区
}
else{
pobj.planInfo.serviceAreaName = appconfig.pdict.registeredParkDict[pobj.planInfo.serviceArea];//注册地区
pobj.baseInfo.serviceAreaName = appconfig.pdict.registeredParkDict[pobj.baseInfo.serviceArea];//注册地区
}
}
}
//修改方案的时候，需要把修改的方案传给商城
var ttype = pobj.businessType;
pobj.businessType = appconfig.pdict.fdyDict[pobj.businessType];
......@@ -294,6 +280,8 @@ class SchemeCtl extends CtlBase {
}
var rtn = await rc.execPost(params, requrl);
var j = JSON.parse(rtn.stdout);
console.log("777777777777777777");
console.log(JSON.stringify(j));
if (j.status == 1){
pobj.businessType = ttype;
var retn = await this.service.updateInfoByDemandCode(pobj);//更新方案详情
......@@ -304,15 +292,15 @@ class SchemeCtl extends CtlBase {
else{
return system.getResultError("更新方案出错！");
}
}
catch(error){
console.log("ffffffffffffffffffffffffffffffff");
console.log(error);
return system.getResultError(error);
}
}
else{
console.log("DDDDDDDDDDDDDDD");
return system.getResultError("参数错误！");
}
}
......@@ -335,6 +323,8 @@ class SchemeCtl extends CtlBase {
/*插入方案信息*/
async insertInfo(pobj, qobj, req){
console.log("11111111111111111111111");
console.log(JSON.stringify(pobj));
if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.baseInfo && pobj.baseInfo != 'undefined'){//商机编号必须存在
try{
pobj.currentStatus = "beforeConfirmation";//商机状态为待用户确认
......@@ -367,10 +357,10 @@ class SchemeCtl extends CtlBase {
}
//纳税人类型
if (pobj.baseInfo.psTaxpayerType && pobj.baseInfo.psTaxpayerType != 'undefined'){
pobj.baseInfo.taxPayerType = pobj.baseInfo.psTaxpayerType;
pobj.baseInfo.taxpayerType = pobj.baseInfo.taxpayerType;
}
if (pobj.baseInfo.cmpTaxPayerType && pobj.baseInfo.cmpTaxPayerType != 'undefined'){
pobj.baseInfo.taxPayerType = pobj.baseInfo.cmpTaxPayerType;
pobj.baseInfo.taxpayerType = pobj.baseInfo.taxpayerType;
}
if (pobj.baseInfo.agentTaxpayerType && pobj.baseInfo.agentTaxpayerType != 'undefined'){
pobj.baseInfo.taxpayerType = pobj.baseInfo.agentTaxpayerType;
......@@ -383,8 +373,8 @@ class SchemeCtl extends CtlBase {
if (pobj.baseInfo.addressType && pobj.baseInfo.addressType != 'undefined'){//地址类型
pobj.baseInfo.addressTypeName = appconfig.pdict.addressTypeDict[pobj.baseInfo.addressType];//地址类型名称
}
if (pobj.baseInfo.TaxPayerType && pobj.baseInfo.TaxPayerType != 'undefined'){
pobj.baseInfo.TaxPayerName = appconfig.pdict.TaxpayerTypeDict[pobj.baseInfo.TaxPayerType];//纳税人名称
if (pobj.baseInfo.taxpayerType && pobj.baseInfo.taxpayerType != 'undefined'){
pobj.baseInfo.taxpayerName = appconfig.pdict.TaxpayerTypeDict[pobj.baseInfo.taxpayerType];//纳税人名称
}
if (pobj.baseInfo.registeredType && pobj.baseInfo.registeredType != 'undefined'){
pobj.baseInfo.registeredName = appconfig.pdict.registeredTypeDict[pobj.baseInfo.registeredType];//云上园区名称
......@@ -407,7 +397,7 @@ class SchemeCtl extends CtlBase {
}
//注册地区
if (pobj.baseInfo.serviceArea && pobj.baseInfo.serviceArea != 'undefined'){
pobj.baseInfo.serviceAreaName = baseInfo.pdict.registeredAreaDict[pobj.baseInfo.serviceArea];//注册地区
pobj.baseInfo.serviceAreaName = appconfig.pdict.registeredAreaDict[pobj.baseInfo.serviceArea];//注册地区
}
}
else if (pobj.businessType == "psCase"){
......@@ -416,7 +406,23 @@ class SchemeCtl extends CtlBase {
pobj.baseInfo.serviceAreaName = appconfig.pdict.registeredParkDict[pobj.baseInfo.serviceArea];//注册地区
}
}
else{
//注册地区
if (pobj.baseInfo.serviceArea && pobj.baseInfo.serviceArea != 'undefined'){
pobj.baseInfo.serviceAreaName = appconfig.pdict.registeredAreaDict[pobj.baseInfo.serviceArea];//注册地区
}
}
//goumaisichang
if (pobj.baseInfo.buyDuration && pobj.baseInfo.buyDuration != 'undefined'){
pobj.baseInfo.buyDuration = appconfig.pdict.buyDurationDict[pobj.baseInfo.buyDuration];
}
if (pobj.baseInfo.isRenew ){
pobj.baseInfo.isRenew = appconfig.pdict.isRenewDict[pobj.baseInfo.isRenew];
}
else{
pobj.baseInfo.isRenew = "不开启"
}
if (pobj.baseInfo.engagedIndustry && pobj.baseInfo.engagedIndustry != 'undefined'){
pobj.baseInfo.engagedIndName = appconfig.pdict.engagedIndustryDict[pobj.baseInfo.engagedIndustry];//从事行业名称
}
......@@ -448,6 +454,8 @@ class SchemeCtl extends CtlBase {
}
var rtn = await rc.execPost(params, requrl);
var j = JSON.parse(rtn.stdout);
console.log("!!!!!!!!!!!!!!!!");
console.log(JSON.stringify(j));
if (j.status == 1){
pobj.schemeNumber = j.data;
pobj.businessType = btype;
......@@ -461,6 +469,7 @@ class SchemeCtl extends CtlBase {
}
catch(error){
console.log("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
console.log(error);
return system.getResultError(error);
}
......
ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js
......@@ -9,6 +9,12 @@ class DeliverybillDao extends Dao {
qc.raw = true;
//检查查询的用户所属公司是否是平台运营公司-1,如果是则不添加公司查询条件, 不添加路径条件,返回所有数据
if (qobj.company_id == 1) {
if (qobj.bizpath && qobj.bizpath != "") {
if (qobj.bizpath.indexOf("pmxdeliverrequest") > 0) {//说明是从商机列表过来的
qw["delivery_status"] = "success";
qw["settle_status"] = "waittosettle";
}
}
return qw
} else {
//需要添加公司查询条件
......@@ -27,7 +33,6 @@ class DeliverybillDao extends Dao {
qw["salesman_id"] = qobj.userid;
}
}
}
}
return qw;
......@@ -52,7 +57,7 @@ class DeliverybillDao extends Dao {
/*根据交付单更新交付材料信息*/
async UpdateInfoByDeliverCode(qobj, t) {//公司注册、云上园区注册时填写交付材料
var whereobj = { "delivery_code": qobj.deliverNumber };
var setobj = { "delivery_info": qobj.deliveryInfo };
var setobj = { "delivery_info": qobj.baseInfo };
return await this.updateByWhere(setobj, whereobj, t);
}
......
ic-deliver/app/base/db/impl/bizchance/materialDao.js
......@@ -28,7 +28,7 @@ class MaterialDao extends Dao {
setobj.position_info = qobj.positionInfo;
}
if (qobj.managerInfo && qobj.managerInfo != 'undefined'){
setobj.position_info = setobj.position_info;
setobj.position_info = qobj.managerInfo;
}
if (qobj.regInfo && qobj.regInfo != 'undefined'){
setobj.file_info = qobj.regInfo;
......
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/"
},
......
ic-deliver/app/base/db/models/delivery/delivery_bill.js
......@@ -50,6 +50,11 @@ module.exports = (db, DataTypes) => {
allowNull: false,
type: DataTypes.STRING
},
settle_status: {// 服务单流转状态
allowNull: false,
type: DataTypes.STRING,
defaultValue:'waittosettle'
},
selling_price: {//售价
allowNull: false,
type: DataTypes.INTEGER
......
ic-deliver/app/base/db/models/delivery/settle_bill.js 0 → 100644
const system = require("../../../system");
const settings = require("../../../../config/settings");
const appconfig = system.getSysConfig();
/**
* 交付单表
*/
module.exports = (db, DataTypes) => {
return db.define("settlebill", {
code: { //交付单编号
allowNull: true,
type: DataTypes.STRING
},
audit_status: {// 审核状态
allowNull: false,
type: DataTypes.STRING,
defaultValue:'waittoaudit'
},
settle_amount: {//结算金额
allowNull: true,
type: DataTypes.INTEGER
},
isPayed:{
type:DataTypes.BOOLEAN,
defaultValue: false
}
}, {
paranoid: true,//真的删除
underscored: true,
version: true,
freezeTableName: true,
//freezeTableName: true,
// define the table's name
tableName: 'fi_settlebill',
validate: {
},
indexes: [
// Create a unique index on email
// {
// unique: true,
// fields: ['email']
// },
//
// // Creates a gin index on data with the jsonb_path_ops operator
// {
// fields: ['data'],
// using: 'gin',
// operator: 'jsonb_path_ops'
// },
//
// // By default index name will be [table]_[fields]
// // Creates a multi column partial index
// {
// name: 'public_by_author',
// fields: ['author', 'status'],
// where: {
// status: 'public'
// }
// },
//
// // A BTREE index with a ordered field
// {
// name: 'title_index',
// method: 'BTREE',
// fields: ['author', {attribute: 'title', collate: 'en_US', order: 'DESC', length: 5}]
// }
]
});
}
ic-deliver/app/base/service/impl/bizchance/schemeSve.js 0 → 100644
const system = require("../../../system");
const ServiceBase = require("../../sve.base");
const settings = require("../../../../config/settings");
const appconfig = system.getSysConfig();
class SchemeService extends ServiceBase {
constructor() {
super("bizchance", ServiceBase.getDaoName(SchemeService));
}
async findById(qobj){//根据id获取方案信息
var oid = qobj.id;
return await this.dao.findById(oid);
}
async findInfoByDemandCode(qobj){//根据方案编号获取方案详情
return await this.dao.findInfoByDemandCode(qobj);
}
async updateStatusByDemandCode(qobj){//根据商机编号号更新方案状态及原因
var self=this;
return self.db.transaction(async function (t) {
return await self.dao.updateStatusByDemandCode(qobj,t);
});
}
async updateInfoByDemandCode(qobj){//根据商机编号更新方案详情
var self = this;
return self.db.transaction(async function (t) {
return await self.dao.updateInfoByDemandCode(qobj,t);
});
}
async updateSchemeNumberByDemandCode(qobj){//根据商机编号更新方案编号
var self = this;
return self.db.transaction(async function (t) {
return await self.dao.updateSchemeNumberByDemandCode(qobj,t);
});
}
async insertInfo(qobj){//插入方案信息
var self = this;
return await self.db.transaction(async function (t) {
return await self.dao.insertInfo(qobj,t);
});
}
}
module.exports = SchemeService;
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment