Skip to content

Z
zhichan
Commit 65458e89 by Sxy
Options

fix: 材料 资质信息 邮寄信息 重复推

parent 2e58dac0
Showing with 55 additions and 25 deletions
icp-deliver/app/base/service/impl/delivery/deliverSve.js
...@@ -47,7 +47,9 @@ class DeliverService extends ServiceBase { ...@@ -47,7 +47,9 @@ class DeliverService extends ServiceBase {
if (!deliverData || ![ if (!deliverData || ![
system.SERVERSESTATUS.COLLECTING, system.SERVERSESTATUS.COLLECTING,
system.SERVERSESTATUS.SUBMITING, system.SERVERSESTATUS.SUBMITING,
system.SERVERSESTATUS.DISPOSEING system.SERVERSESTATUS.DISPOSEING,
system.SERVERSESTATUS.POSTING,
system.SERVERSESTATUS.SUCCESS,
].includes(deliverData.delivery_status)) { ].includes(deliverData.delivery_status)) {
throw new Error("此交付单不可提交材料"); throw new Error("此交付单不可提交材料");
} }
...@@ -185,9 +187,31 @@ class DeliverService extends ServiceBase { ...@@ -185,9 +187,31 @@ class DeliverService extends ServiceBase {
if (!deliverData) { if (!deliverData) {
throw new Error("查不到交付单"); throw new Error("查不到交付单");
} }
if (deliverData.delivery_status !== system.SERVERSESTATUS.DISPOSEING) { if (![system.SERVERSESTATUS.DISPOSEING, system.SERVERSESTATUS.SUCCESS, system.SERVERSESTATUS.POSTING].includes(deliverData.delivery_status)) {
throw new Error("该交付单状态下不可提交"); throw new Error("该交付单状态下不可提交");
} }
if ([system.SERVERSESTATUS.SUCCESS, system.SERVERSESTATUS.POSTING].includes(deliverData.delivery_status)) {
//给腾讯 发消息
const STATUS = {
"success": pushTx.TXSTATUS.SUCCESS,
"posting": pushTx.TXSTATUS.POSTING
};
await pushTx.pushChangeOrder(STATUS[deliverData.delivery_status], deliverData.delivery_code, {
qualification: {
businessScope: pobj.businessScope,
businessTypes: pobj.businessTypes,
certificateNumber: pobj.certificateNumber,
endAt: pobj.endAt,
file: pobj.file,
serviceProject: pobj.serviceProject,
startAt: pobj.startAt,
deliver_id: pobj.deliver_id
}
});
await this.qualificationDao.createOrUpdate(pobj);
return "SUCCESS"
}
let annualReportData; let annualReportData;
let annualReportArry = []; let annualReportArry = [];
...@@ -326,15 +350,19 @@ class DeliverService extends ServiceBase { ...@@ -326,15 +350,19 @@ class DeliverService extends ServiceBase {
if (!result.qualification) { if (!result.qualification) {
throw new Error("请先上传资质信息"); throw new Error("请先上传资质信息");
} }
if (result.delivery_status !== system.SERVERSESTATUS.DISPOSEING) { if (![system.SERVERSESTATUS.DISPOSEING, system.SERVERSESTATUS.SUCCESS, system.SERVERSESTATUS.POSTING].includes(result.delivery_status)) {
throw new Error("该状态下不可填写邮寄信息"); throw new Error("该状态下不可填写邮寄信息");
} }
const { material } = result; const { material } = result;
let { proposerInfo } = material let { proposerInfo } = material
proposerInfo.recipientInfo = pobj.recipientInfo; proposerInfo.recipientInfo = pobj.recipientInfo;
const STATUS = {
"disposeing": pushTx.TXSTATUS.POSTING,
"success": pushTx.TXSTATUS.SUCCESS,
"posting": pushTx.TXSTATUS.POSTING
};
await pushTx.pushChangeOrder(STATUS[result.delivery_status], result.delivery_code, {
await pushTx.pushChangeOrder(pushTx.TXSTATUS.POSTING, result.delivery_code, {
qualification: result.qualification, qualification: result.qualification,
recipientInfo: { recipientInfo: {
...pobj.recipientInfo, ...pobj.recipientInfo,
...@@ -350,19 +378,21 @@ class DeliverService extends ServiceBase { ...@@ -350,19 +378,21 @@ class DeliverService extends ServiceBase {
id: material.id id: material.id
}, t); }, t);
await this.dao.updateByWhere({ if (system.SERVERSESTATUS.DISPOSEING === result.delivery_status) {
delivery_status: system.SERVERSESTATUS.POSTING, await this.dao.updateByWhere({
}, { delivery_status: system.SERVERSESTATUS.POSTING,
id: pobj.id }, {
}, t); id: pobj.id
}, t);
this.statuslogDao.create({ this.statuslogDao.create({
flow_type: system.FLOWCODE.DELIVERY, flow_type: system.FLOWCODE.DELIVERY,
flow_id: pobj.id, flow_id: pobj.id,
status_code: system.SERVERSESTATUS.POSTING, status_code: system.SERVERSESTATUS.POSTING,
salesman_id: pobj.userid, salesman_id: pobj.userid,
salesman_name: pobj.username salesman_name: pobj.username
}); });
}
return "success" return "success"
}); });
} }
......
icp-deliver/app/base/utils/totxClient.js
...@@ -9,7 +9,7 @@ const BUSINESSTYPE = { ...@@ -9,7 +9,7 @@ const BUSINESSTYPE = {
EDI: "/qcfw/edi/" EDI: "/qcfw/edi/"
} }
const TXSTATUS = { const TXSTATUS = {
COLLECTING: "70",//手机材料中 COLLECTING: "70",//收集材料中
SUBMITING: "80",//递交材料中 SUBMITING: "80",//递交材料中
DISPOSEING: "90",//工信部处理中 DISPOSEING: "90",//工信部处理中
POSTING: "150",//证书已邮寄 POSTING: "150",//证书已邮寄
...@@ -110,15 +110,15 @@ const pushChangeOrder = async (status, orderNum, data = {}) => { ...@@ -110,15 +110,15 @@ const pushChangeOrder = async (status, orderNum, data = {}) => {
*/ */
const submitMaterials = async (deliverData, materials) => { const submitMaterials = async (deliverData, materials) => {
materials = buildValue(materials, encryptStr); materials = buildValue(materials, encryptStr);
let status; const STATUS = {
if (deliverData.delivery_status === system.SERVERSESTATUS.COLLECTING || deliverData.delivery_status === system.SERVERSESTATUS.SUBMITING) { "collecting": TXSTATUS.SUBMITING,
status = TXSTATUS.SUBMITING; "submiting": TXSTATUS.SUBMITING,
} "disposeing": TXSTATUS.DISPOSEING,
if (deliverData.delivery_status === system.SERVERSESTATUS.DISPOSEING) { "posting": TXSTATUS.POSTING,
status = TXSTATUS.DISPOSEING; "success": TXSTATUS.SUCCESS
} }
materials.proposerInfo.businessInformation.ifListed = materials.proposerInfo.businessInformation.ifListed === "true" materials.proposerInfo.businessInformation.ifListed = materials.proposerInfo.businessInformation.ifListed === "true"
await pushChangeOrder(status, deliverData.delivery_code, { await pushChangeOrder(STATUS[deliverData.delivery_status], deliverData.delivery_code, {
servicerName: deliverData.facilitator_name, servicerName: deliverData.facilitator_name,
servicerCode: deliverData.facilitator_id, servicerCode: deliverData.facilitator_id,
clerkId: deliverData.salesman_id, clerkId: deliverData.salesman_id,
......
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