Skip to content

Z
zhichan
Commit de1345ec by 高宇强
Options

gyq

parent 478eb2e7
Showing with 51 additions and 22 deletions
ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
...@@ -64,7 +64,7 @@ class DeliverybillCtl extends CtlBase { ...@@ -64,7 +64,7 @@ class DeliverybillCtl extends CtlBase {
} }
/*根据交付单编号获取交付单详情和材料详情*/ /*根据交付单编号获取交付单详情和材料详情*/
async DealInfo(pobj,qobj,req){// async DealInfo(pobj,qobj,req){
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') if (pobj.deliverNumber && pobj.deliverNumber != 'undefined')
{ {
try{ try{
...@@ -73,22 +73,29 @@ class DeliverybillCtl extends CtlBase { ...@@ -73,22 +73,29 @@ class DeliverybillCtl extends CtlBase {
var rarr = {} var rarr = {}
if (rs){ if (rs){
rarr.id = rs.id;//数据的id rarr.id = rs.id;//数据的id
rarr.deliverNumber = rs.deliver_code;//交付单编号 rarr.baseInfo.deliverNumber = rs.deliver_code;//交付单编号
rarr.businessName = rs.product_name;//产品名称 rarr.baseInfo.businessName = rs.product_name;//产品名称
rarr.businessType = rs.product_code;//产品编码 rarr.baseInfo.businessType = rs.product_code;//产品编码
rarr.channelSource = rs.source_name;//渠道名称 rarr.baseInfo.channelSource = rs.source_name;//渠道名称
rarr.channelNumber = rs.source_number;//渠道编码 rarr.baseInfo.channelNumber = rs.source_number;//渠道编码
rarr.baseInfo = rs.delivery_info;//交付单详情 rarr.baseInfo.serviceCode = rs.service_address;//服务地区编码
rarr.serviceCode = rs.service_address;//服务地区编码 rarr.baseInfo.servicerCode = rs.facilitator_id;//服务商编码
rarr.baseInfo.servicerName = rs.facilitator_name;//服务商名称
rarr.baseInfo.clerkName = rs.salesman_name;//业务员名称
rarr.baseInfo.clerkPhone = rs.salesman_phone;//业务员电话
rarr.baseInfo.sellingPrice = rs.selling_price;//价格
rarr.baseInfo.costPrice = rs.cost_price;//成本价
if (rarr.businessName == "云上园区注册"){ if (rarr.businessName == "云上园区注册"){
rarr.serviceArea = appconfig.pdict.registeredParkDict[rarr.serviceCode];//服务地区名称 rarr.baseInfo.serviceArea = appconfig.pdict.registeredParkDict[rarr.serviceCode];//服务地区名称
} }
else{ else{
rarr.serviceArea = appconfig.pdict.registeredAreaDict[rarr.serviceCode];//服务地区名称 rarr.baseInfo.serviceArea = appconfig.pdict.registeredAreaDict[rarr.serviceCode];//服务地区名称
} }
rarr.deliveryInfo = rs.delivery_info;//交付单详情 rarr.deliveryInfo = rs.delivery_info;//交付单详情
rarr.contactsInfo.contactsName = rs.delivery_info.contactsName;//联系人信息 rarr.contactsInfo.contactsName = rs.delivery_info.contactsName;//联系人信息
rarr.contactsInfo.contactsPhone = rs.delivery_info.contactsPhone;//联系电话信息 rarr.contactsInfo.contactsPhone = rs.delivery_info.contactsPhone;//联系电话信息
rarr.statusInfo.deliverStatus = rs.delivery_status;//状态
rarr.statusInfo.statusReason = rs.close_reason;//状态原因
rarr.companyInfo = ms.company_info;//公司详情 rarr.companyInfo = ms.company_info;//公司详情
rarr.registeredInfo = ms.registered_info;//注册信息 rarr.registeredInfo = ms.registered_info;//注册信息
rarr.contributionInfo = ms.contribution_info;//出资比例信息 rarr.contributionInfo = ms.contribution_info;//出资比例信息
...@@ -127,12 +134,13 @@ class DeliverybillCtl extends CtlBase { ...@@ -127,12 +134,13 @@ class DeliverybillCtl extends CtlBase {
} }
/*根据交付单编号更新交付单详情*/ /*根据交付单编号更新交付单详情*/
async updateInfoByDeliverCode(pobj,qobj,req){ async updateInfoByDeliverCode(pobj,qobj,req){//
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined'){ if (pobj.deliverNumber && pobj.deliverNumber != 'undefined'){
try{ try{
var rs = await this.service.findInfoByDeliverCode(pobj)//先得到交付单详情
//判断工商扫描件和营业执照扫描件是否存在,若存在更新交付单的详情 //判断工商扫描件和营业执照扫描件是否存在,若存在更新交付单的详情
if ((pobj.baseInfo.officialSeal && pobj.baseInfo.officialSeal != 'undefined') || (pobj.baseInfo.businessLicense && pobj.baseInfo.businessLicense != 'undefined')){ 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; var deliveryInfo = rs.delivery_info;
if (pobj.baseInfo.officialSeal && pobj.baseInfo.officialSeal != 'undefined'){ if (pobj.baseInfo.officialSeal && pobj.baseInfo.officialSeal != 'undefined'){
deliveryInfo.officialSeal = pobj.baseInfo.officialSeal; deliveryInfo.officialSeal = pobj.baseInfo.officialSeal;
...@@ -165,9 +173,9 @@ class DeliverybillCtl extends CtlBase { ...@@ -165,9 +173,9 @@ class DeliverybillCtl extends CtlBase {
var params = { var params = {
"actionType":"updateOrderStatus", "actionType":"updateOrderStatus",
"actionBody":{ "actionBody":{
"orderNum": rs.demand_code,//订单编码 "orderNum": pobj.deliverNumber,//订单编码
"status":appconfig.pdict.ddyDict["collecting"], "status":appconfig.pdict.ddyDict["collecting"],
"deliverContent":pobj; "deliverContent":pobj
} }
} }
var rtn = await rc.execPost(params, requrl); var rtn = await rc.execPost(params, requrl);
...@@ -176,7 +184,7 @@ class DeliverybillCtl extends CtlBase { ...@@ -176,7 +184,7 @@ class DeliverybillCtl extends CtlBase {
return system.getResult("操作成功！"); return system.getResult("操作成功！");
} }
else{ else{
return system.getResultError("更新方案状态出错！"); return system.getResultError("更新交付单状态出错！");
} }
} }
catch(error){ catch(error){
...@@ -198,8 +206,26 @@ class DeliverybillCtl extends CtlBase { ...@@ -198,8 +206,26 @@ class DeliverybillCtl extends CtlBase {
&& pobj.deliverNumber && pobj.deliverNumber != 'undefined'){ && pobj.deliverNumber && pobj.deliverNumber != 'undefined'){
try{ try{
//更新状态给庄冰 //更新状态给庄冰
var res = await this.service.insertInfo(pobj); var rc = system.getObject("util.execClient");
return system.getResult("插入成功！"); var requrl = this.receiveUrl;
var params = {
"actionType":"updateOrderStatus",
"actionBody":{
"orderNum": pobj.businessMode,//订单编码
"status":2,//已接单
"deliverContent":pobj
}
}
var rtn = await rc.execPost(params, requrl);
var j = JSON.parse(rtn.stdout);
if (j.status == 1){
var res = await this.service.insertInfo(pobj);
return system.getResult("插入成功！");
}
else{
return system.getResultError("插入数据失败！");
}
} }
catch (error){ catch (error){
return system.getResultError(error); return system.getResultError(error);
...@@ -218,8 +244,11 @@ class DeliverybillCtl extends CtlBase { ...@@ -218,8 +244,11 @@ class DeliverybillCtl extends CtlBase {
module.exports = DeliverybillCtl; module.exports = DeliverybillCtl;
// var task = new DeliverybillCtl(); // var task = new DeliverybillCtl();
// var obj={}; // var obj={"deliverNumber":"1111115","baseInfo":"","deliverInfo":{"isVirtual": "否", "isWhether": "是", "payStatus": "已交付", "contactsName": "张三", "contactsPhone": "13800138000"},"companyInfo":{"isWhether": "no", "addressType": "practical", "fullAddress": "gsgsgsgsgsg", "taxpayerType": "smallScaleTaxpayer", "businessScope": "sgsgsdgsdgd", "engagedIndustry": "culturalMedia", "companyProperties": "limitedLiabilityCompany"},
// task.updateStatusByDemandCode(obj,{},{}).then(d=>{ // "registeredInfo":{"registeredCapital":"500","registeredDate":"20","reserveProportion":"15"},"contributionInfo":{"contribution_info":[{"shareholderName":"王五","contributionAmount":"200","contributionProportion":"40","IdentificationNumber":"1111111","phoneNumber":"1111111","contactAddress":"北京"},
// {"shareholderName":"王六","contributionAmount":"200","contributionProportion":"40","IdentificationNumber":"1111111","phoneNumber":"1111111","contactAddress":"北京"},
// {"shareholderName":"王七","contributionAmount":"100","contributionProportion":"20","IdentificationNumber":"1111111","phoneNumber":"1111111","contactAddress":"北京"}]}};
// task.updateInfoByDeliverCode(obj,{},{}).then(d=>{
// console.log(d); // console.log(d);
// //console.log(d[0].analyse); // //console.log(d[0].analyse);
......
ic-deliver/app/base/controller/impl/bizchance/schemeCtl.js
...@@ -230,7 +230,7 @@ class SchemeCtl extends CtlBase { ...@@ -230,7 +230,7 @@ class SchemeCtl extends CtlBase {
if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.currentStatus && pobj.currentStatus != 'undefined' if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.currentStatus && pobj.currentStatus != 'undefined'
&& pobj.baseInfo && pobj.baseInfo != 'undefined'){//商机编号必须存在 && pobj.baseInfo && pobj.baseInfo != 'undefined'){//商机编号必须存在
try{ try{
await this.bizoptService.updateStatusBySchemeNumber(pobj);//修改商机状态 await this.bizoptService.updateStatusByDemandCode(pobj);//修改商机状态
var businessInfo = await this.bizoptService.findInfoByDemandCode(pobj);//得到商机的信息 var businessInfo = await this.bizoptService.findInfoByDemandCode(pobj);//得到商机的信息
if (businessInfo){ if (businessInfo){
pobj.businessId = businessInfo.id;//商机id pobj.businessId = businessInfo.id;//商机id
...@@ -286,7 +286,7 @@ class SchemeCtl extends CtlBase { ...@@ -286,7 +286,7 @@ class SchemeCtl extends CtlBase {
module.exports = SchemeCtl; module.exports = SchemeCtl;
// var task = new SchemeCtl(); // var task = new SchemeCtl();
// var obj={"businessMode":"202006100011","memoInfo":"sfdsff","whetherType":"individual","creditCode":"1223345455","companyType":"有限公司","companyName":"三个五","establishedTime":"2010-5-6","registeredCapital":"5万元","shareholderName":"2B","businessTerm":"500","businessScope":"sgrgdrgghhh","residenceAddress":"北京市"}; // var obj={"businessMode":"202006100012","currentStatus":"beforeSubmission","baseInfo":{"memoInfo":"sfdsff","whetherType":"individual","creditCode":"1223345455","companyType":"有限公司","companyName":"三个五","establishedTime":"2010-5-6","registeredCapital":"5万元","shareholderName":"2B","businessTerm":"500","businessScope":"sgrgdrgghhh","residenceAddress":"北京市"}};
// task.insertInfo(obj,{},{}).then(d=>{ // task.insertInfo(obj,{},{}).then(d=>{
// console.log(d); // console.log(d);
// //console.log(d[0].analyse); // //console.log(d[0].analyse);
......
ic-deliver/app/base/service/impl/bizchance/materialSve.js
...@@ -21,7 +21,7 @@ class MaterialService extends ServiceBase { ...@@ -21,7 +21,7 @@ class MaterialService extends ServiceBase {
async updateInfoByDeliverNumber(qobj){ async updateInfoByDeliverNumber(qobj){
var self=this; var self=this;
return self.db.transaction(async function (t) { return self.db.transaction(async function (t) {
return await self.dao.updateInfoByNumber(qobj,t); return await self.dao.updateInfoByDeliverNumber(qobj,t);
}); });
} }
......
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