Skip to content

Z
zhichan
Commit c2b0472f by 蒋勇
Options

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

parents 81b648af 71551b2f
Showing with 64 additions and 38 deletions
ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
......@@ -122,7 +122,7 @@ class DeliverybillCtl extends CtlBase {
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.deliverStatus && pobj.deliverStatus != 'undefined'){
try{
var res = await this.service.updateInfoByDeliverCode(pobj);
//调商城接口，回传状态信息，后加
//调商城接口，回传状态信息，放队列
return system.getResult("更新成功！");
}
......@@ -135,30 +135,56 @@ class DeliverybillCtl extends CtlBase {
}
}
/*根据交付单编号更新交付单详情*/
async updateInfoByDeliverCode(pobj,qobj,req){//
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined'){
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')))){
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;
rs.delivery_info.officialSeal = pobj.baseInfo.officialSeal;
}
if (pobj.baseInfo.businessLicense && pobj.baseInfo.businessLicense != 'undefined'){
deliveryInfo.businessLicense = pobj.baseInfo.businessLicense;
rs.delivery_info.businessLicense = pobj.baseInfo.businessLicense;
}
//更新详情
var uarr = {
"deliverNumber":pobj.deliverNumber,
"deliveryInfo":deliveryInfo
"baseInfo":rs.delivery_info
};
await this.service.updateInfoByDeliverCode(uarr);
//回传信息给庄冰，放队列
return system.getResult("更新成功");
}
catch(error){
return system.getResultError(error);
}
}
else{
return system.getResultError("参数错误！");
}
}
async updateExpressInfoByDeliverCode(pobj,qobj,req){//更新邮寄信息
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.expressInfo && pobj.expressInfo != 'undefined'){
try{
await this.materialService.updateInfoByDeliverNumber(pobj);
//回传庄冰，放队列
return system.getResult("更新成功");
}
catch{
return system.getResultError(error);
}
}
else{
return system.getResultError("参数错误！");
}
}
/*根据交付单编号更新交付单详情*/
async updateInfoByDeliverCode(pobj,qobj,req){//
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined'){
try{
//更新详情
await this.service.updateInfoByDeliverCode(pobj);
//更新材料信息
await this.materialService.updateInfoByDeliverNumber(pobj);
var statusInfo = {
......@@ -167,27 +193,27 @@ class DeliverybillCtl extends CtlBase {
};
//更新状态
await this.service.updateStatusByDeliverCode(statusInfo);
//传给庄冰
pobj.baseInfo = deliveryInfo;
var rc = system.getObject("util.execClient");
var requrl = this.receiveUrl;
var params = {
"actionType":"updateOrderStatus",
"actionBody":{
"orderNum": pobj.deliverNumber,//订单编码
"status":appconfig.pdict.ddyDict["collecting"],
"deliverContent":pobj
}
}
var rtn = await rc.execPost(params, requrl);
var j = JSON.parse(rtn.stdout);
if (j.status == 1){
return system.getResult("操作成功！");
}
else{
return system.getResultError("更新交付单状态出错！");
}
//传给庄冰，放队列
// pobj.baseInfo = deliveryInfo;
// var rc = system.getObject("util.execClient");
// var requrl = this.receiveUrl;
// var params = {
// "actionType":"updateOrderStatus",
// "actionBody":{
// "orderNum": pobj.deliverNumber,//订单编码
// "status":appconfig.pdict.ddyDict["collecting"],
// "deliverContent":pobj
// }
// }
// 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);
......@@ -214,7 +240,7 @@ class DeliverybillCtl extends CtlBase {
"actionType":"updateOrderStatus",
"actionBody":{
"orderNum": pobj.businessMode,//订单编码
"status":2,//已接单
"status":20,//已接单
"deliverContent":pobj
}
}
......
ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js
......@@ -57,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
......@@ -15,7 +15,7 @@ class MaterialDao extends Dao {
async updateInfoByDeliverNumber(qobj,t){
var whereobj = {"delivery_code":qobj.deliverNumber};
var setobj = {};
if (qobj.companyInfo && qobj.company_info != 'undefined'){
if (qobj.companyInfo && qobj.companyInfo != 'undefined'){
setobj.company_info = qobj.companyInfo;
}
if (qobj.registeredInfo && qobj.registeredInfo != 'undefined'){
......@@ -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/metadata/app/platform.js
......@@ -144,8 +144,8 @@ module.exports = {
"virtual": "虚拟地址"
},
"registeredTypeDict": {//个体户类型
"selfEmployed": "个体商户",
"soleProprietorship": "个人独资"
"selfEmployed": "个体工商户",
"soleProprietorship": "个人独资企业"
},
"registeredParkDict":{//注册园区
"shanghai":"上海云上公司",
......
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