Skip to content

Z
zhichan
Commit 124ba0d6 by 宋毅
Options

新接口修改

parent de0b900c
Showing with 155 additions and 66 deletions
center-order/app/base/service/impl/dbneed/needsolutionSve.js
...@@ -759,6 +759,10 @@ class NeedsolutionService extends ServiceBase { ...@@ -759,6 +759,10 @@ class NeedsolutionService extends ServiceBase {
needNo:ab.bizId,channelNeedNo:ab.bizId,status:"ywc" needNo:ab.bizId,channelNeedNo:ab.bizId,status:"ywc"
}; };
var newSolutionCount = { var newSolutionCount = {
"interface_param":{
push_channel_interface_path:ab.product_info.push_channel_interface_path || "",
push_channel_interface_method:ab.product_info.push_channel_interface_method || ""
},
"status": "PAID", "status": "PAID",
"bizType": ab.product_info && ab.product_info.item_code?ab.product_info.item_code:"", "bizType": ab.product_info && ab.product_info.item_code?ab.product_info.item_code:"",
"solution": { "solution": {
......
center-order/app/base/service/impl/qcutils/baseqcSve.js
const system = require("../../../system"); const system = require("../../../system");
const moment = require('moment'); const moment = require('moment');
const settings = require("../../../../config/settings");
/** /**
* 阿里云增值电信相关接口（ICP、EDI） * 阿里云增值电信相关接口（ICP、EDI）
...@@ -461,8 +462,9 @@ class BaseQcService { ...@@ -461,8 +462,9 @@ class BaseQcService {
} }
} }
//服务商通知状态变更 //服务商通知状态变更-新的资质类产品在用，兼容老的渠道
async acceptIcpPartnerNotification(pobj) { async acceptIcpPartnerNotification(pobj) {
pobj.actionBody.ApplicationStatus = pobj.actionBody.status || pobj.actionBody.ApplicationStatus;//新接口改用status
let self = this; let self = this;
let ab = pobj.actionBody; let ab = pobj.actionBody;
try { try {
...@@ -501,122 +503,194 @@ class BaseQcService { ...@@ -501,122 +503,194 @@ class BaseQcService {
let uapp_id = orderInfo.uapp_id; let uapp_id = orderInfo.uapp_id;
let channelOrderNo = orderInfo.channelOrderNo let channelOrderNo = orderInfo.channelOrderNo
// if (ab.ApplicationStatus == 507) {//完成账户注册
// if (uapp_id == '18') {
// if (solutionContent.status != "USER_CONFIRMED") {
// return system.getResultFail(-508, "交付流程错误，用户确认递交⽂件后才能执行此操作");
// }
// }
// solutionFlowList.push({
// file: ab.OfficialFileURL || "",
// status: "ACCOUNT_REGISTERED",
// statusName: this.icpSolutionStatusReference.ACCOUNT_REGISTERED,
// updated_at: new Date()
// });
// solutionContent.status = "ACCOUNT_REGISTERED";
// solutionContent.statusName = this.icpSolutionStatusReference.ACCOUNT_REGISTERED;
// }
// if (ab.ApplicationStatus == 508) {//"服务商完成提交资料到⼯信部
// if (solutionContent.status != "ACCOUNT_REGISTERED") {
// return system.getResultFail(-508, "交付流程错误，请先完成账户注册");
// }
// solutionFlowList.push({
// file: ab.OfficialFileURL || "",
// status: "MATERIAL_SUBMITTED",
// statusName: this.icpSolutionStatusReference.MATERIAL_SUBMITTED,
// updated_at: new Date()
// });
// solutionContent.status = "MATERIAL_SUBMITTED";
// solutionContent.statusName = this.icpSolutionStatusReference.MATERIAL_SUBMITTED;
// }
// if (ab.ApplicationStatus == 509) {//⼯商部已受理
// if (solutionContent.status != "MATERIAL_SUBMITTED") {
// return system.getResultFail(-509, "交付流程错误，请先完成资料递交");
// }
// solutionFlowList.push({
// file: ab.OfficialFileURL || "",
// status: "GXB_ACCEPT", statusName: this.icpSolutionStatusReference.GXB_ACCEPT,
// updated_at: new Date()
// });
// solutionContent.status = "GXB_ACCEPT";
// solutionContent.statusName = this.icpSolutionStatusReference.GXB_ACCEPT;
// }
// if (ab.ApplicationStatus == 510) {//⼯商部不予受理
// if (solutionContent.status != "MATERIAL_SUBMITTED") {
// return system.getResultFail(-510, "交付流程错误，请先完成资料递交");
// }
// solutionFlowList.push({
// file: ab.OfficialFileURL || "",
// status: "GXB_REFUSE", statusName: this.icpSolutionStatusReference.GXB_REFUSE,
// updated_at: new Date()
// });
// solutionContent.status = "GXB_REFUSE";
// needsolutioninfo.status = "ywc";
// solutionContent.statusName = this.icpSolutionStatusReference.GXB_REFUSE;
// }
// if (ab.ApplicationStatus == 511) {//⼯商部通过
// if (solutionContent.status != "GXB_ACCEPT") {
// return system.getResultFail(-511, "交付流程错误，⼯信部已受理后才能执行此操作");
// }
// if (uapp_id == "18") {
// solutionFlowList.push({
// file: ab.OfficialFileURL || "", status: "GXB_SUCCESS",
// statusName: this.icpSolutionStatusReference.GXB_SUCCESS,
// updated_at: new Date(),
// CertificateNumber: ab.CertificateNumber,
// CertificateStartTime: ab.CertificateStartTime,
// CertificateEndTime: ab.CertificateEndTime
// });
// } else {
// solutionFlowList.push({
// file: ab.OfficialFileURL || "",
// status: "GXB_SUCCESS",
// statusName: this.icpSolutionStatusReference.GXB_SUCCESS,
// updated_at: new Date()
// });
// }
// needsolutioninfo.status = "ywc";
// solutionContent.status = "GXB_SUCCESS";
// solutionContent.statusName = this.icpSolutionStatusReference.GXB_SUCCESS;
// }
// if (ab.ApplicationStatus == 512) {//⼯信部未通过
// if (solutionContent.status != "GXB_ACCEPT") {
// return system.getResultFail(-512, "交付流程错误，⼯信部已受理后才能执行此操作");
// }
// solutionFlowList.push({
// file: ab.OfficialFileURL || "",
// status: "GXB_FAIL", statusName: this.icpSolutionStatusReference.GXB_FAIL,
// updated_at: new Date()
// });
// solutionContent.status = "GXB_FAIL";
// needsolutioninfo.status = "ywc";
// solutionContent.statusName = this.icpSolutionStatusReference.GXB_FAIL;
// }
if (ab.ApplicationStatus == 507) {//完成账户注册 if (ab.ApplicationStatus == 507) {//完成账户注册
if (uapp_id == '18') { if (uapp_id == '18') {
if (solutionContent.status != "USER_CONFIRMED") { if (solutionContent.status != "USER_CONFIRMED") {
return system.getResultFail(-508, "交付流程错误，用户确认递交⽂件后才能执行此操作"); return system.getResultFail(-508, "交付流程错误，用户确认递交⽂件后才能执行此操作");
} }
} }
solutionContent.ApplicationStatus = 507;
solutionFlowList.push({
file: ab.OfficialFileURL || "",
status: "ACCOUNT_REGISTERED",
statusName: this.icpSolutionStatusReference.ACCOUNT_REGISTERED,
updated_at: new Date()
});
solutionContent.status = "ACCOUNT_REGISTERED";
solutionContent.statusName = this.icpSolutionStatusReference.ACCOUNT_REGISTERED;
} }
if (ab.ApplicationStatus == 508) {//"服务商完成提交资料到⼯信部 if (ab.ApplicationStatus == 508) {//"服务商完成提交资料到⼯信部
if (solutionContent.status != "ACCOUNT_REGISTERED") { if (solutionContent.status != "ACCOUNT_REGISTERED") {
return system.getResultFail(-508, "交付流程错误，请先完成账户注册"); return system.getResultFail(-508, "交付流程错误，请先完成账户注册");
} }
solutionFlowList.push({
file: ab.OfficialFileURL || "",
status: "MATERIAL_SUBMITTED",
statusName: this.icpSolutionStatusReference.MATERIAL_SUBMITTED,
updated_at: new Date()
});
solutionContent.status = "MATERIAL_SUBMITTED";
solutionContent.statusName = this.icpSolutionStatusReference.MATERIAL_SUBMITTED;
} }
if (ab.ApplicationStatus == 509) {//⼯商部已受理 if (ab.ApplicationStatus == 509) {//⼯商部已受理
if (solutionContent.status != "MATERIAL_SUBMITTED") { if (solutionContent.status != "MATERIAL_SUBMITTED") {
return system.getResultFail(-509, "交付流程错误，请先完成资料递交"); return system.getResultFail(-509, "交付流程错误，请先完成资料递交");
} }
solutionFlowList.push({
file: ab.OfficialFileURL || "",
status: "GXB_ACCEPT", statusName: this.icpSolutionStatusReference.GXB_ACCEPT, updated_at: new Date()
});
solutionContent.status = "GXB_ACCEPT";
solutionContent.statusName = this.icpSolutionStatusReference.GXB_ACCEPT;
} }
if (ab.ApplicationStatus == 510) {//⼯商部不予受理 if (ab.ApplicationStatus == 510) {//⼯商部不予受理
if (solutionContent.status != "MATERIAL_SUBMITTED") { if (solutionContent.status != "MATERIAL_SUBMITTED") {
return system.getResultFail(-510, "交付流程错误，请先完成资料递交"); return system.getResultFail(-510, "交付流程错误，请先完成资料递交");
} }
solutionFlowList.push({
file: ab.OfficialFileURL || "",
status: "GXB_REFUSE", statusName: this.icpSolutionStatusReference.GXB_REFUSE, updated_at: new Date()
});
solutionContent.status = "GXB_REFUSE";
needsolutioninfo.status = "ywc"; needsolutioninfo.status = "ywc";
solutionContent.statusName = this.icpSolutionStatusReference.GXB_REFUSE;
} }
if (ab.ApplicationStatus == 511) {//⼯商部通过 if (ab.ApplicationStatus == 511) {//⼯商部通过
if (solutionContent.status != "GXB_ACCEPT") { if (solutionContent.status != "GXB_ACCEPT") {
return system.getResultFail(-511, "交付流程错误，⼯信部已受理后才能执行此操作"); return system.getResultFail(-511, "交付流程错误，⼯信部已受理后才能执行此操作");
} }
if (uapp_id == "18") {
solutionFlowList.push({
file: ab.OfficialFileURL || "", status: "GXB_SUCCESS",
statusName: this.icpSolutionStatusReference.GXB_SUCCESS, updated_at: new Date(),
CertificateNumber: ab.CertificateNumber,
CertificateStartTime: ab.CertificateStartTime,
CertificateEndTime: ab.CertificateEndTime
});
} else {
solutionFlowList.push({
file: ab.OfficialFileURL || "",
status: "GXB_SUCCESS",
statusName: this.icpSolutionStatusReference.GXB_SUCCESS,
updated_at: new Date()
});
}
needsolutioninfo.status = "ywc"; needsolutioninfo.status = "ywc";
solutionContent.status = "GXB_SUCCESS";
solutionContent.statusName = this.icpSolutionStatusReference.GXB_SUCCESS;
} }
if (ab.ApplicationStatus == 512) {//⼯信部未通过 if (ab.ApplicationStatus == 512) {//⼯信部未通过
if (solutionContent.status != "GXB_ACCEPT") { if (solutionContent.status != "GXB_ACCEPT") {
return system.getResultFail(-512, "交付流程错误，⼯信部已受理后才能执行此操作"); return system.getResultFail(-512, "交付流程错误，⼯信部已受理后才能执行此操作");
} }
solutionFlowList.push({
file: ab.OfficialFileURL || "",
status: "GXB_FAIL", statusName: this.icpSolutionStatusReference.GXB_FAIL, updated_at: new Date()
});
solutionContent.status = "GXB_FAIL";
needsolutioninfo.status = "ywc"; needsolutioninfo.status = "ywc";
solutionContent.statusName = this.icpSolutionStatusReference.GXB_FAIL;
} }
let tmpDeliveryStatus = settings.icpDeliveryStatusReference()[ab.ApplicationStatus];
solutionFlowList.push({
file: ab.OfficialFileURL || "",
status: tmpDeliveryStatus ? tmpDeliveryStatus.key : "",
statusName: tmpDeliveryStatus ? tmpDeliveryStatus.value : "",
updated_at: new Date(),
//以下参数兼容之前渠道
CertificateNumber: ab.CertificateNumber,
CertificateStartTime: ab.CertificateStartTime,
CertificateEndTime: ab.CertificateEndTime
});
solutionContent.status = tmpDeliveryStatus ? tmpDeliveryStatus.key : "";
solutionContent.statusName = tmpDeliveryStatus ? tmpDeliveryStatus.value : "";
solutionContent.solutionFlowList = solutionFlowList; solutionContent.solutionFlowList = solutionFlowList;
//返回状态 //返回状态
let statusObj = {}; // let statusObj = {};
let applicationStatusList = solutionContent.applicationStatusList || []; let applicationStatusList = solutionContent.applicationStatusList || [];
if (uapp_id == "18") { // //保存材料
statusObj = { // if (uapp_id == "18") {
// statusObj = {
// "OfficialFileURL": ab.OfficialFileURL || "",
// "ApplicationStatus": ab.ApplicationStatus,
// "ApplicationStatusName": this.icpApplicationStatusReference[ab.ApplicationStatus],
// "created_at": new Date(),
// // 2021-3-18 addNew
// "CertificateNumber": ab.CertificateNumber || "",//证书编号
// "CertificateStartTime": ab.CertificateStartTime || "",//证书有效期 开始时间
// "CertificateEndTime": ab.CertificateEndTime || ""//证书有效期 结束时间
// };
// } else {
// statusObj = {
// "OfficialFileURL": ab.OfficialFileURL || "",
// "ApplicationStatus": ab.ApplicationStatus,
// "ApplicationStatusName": this.icpApplicationStatusReference[ab.ApplicationStatus],
// "created_at": new Date()
// };
// }
//返回状态
let statusObj = {
"OfficialFileURL": ab.OfficialFileURL || "", "OfficialFileURL": ab.OfficialFileURL || "",
"ApplicationStatus": ab.ApplicationStatus, "ApplicationStatus": ab.ApplicationStatus,
"ApplicationStatusName": this.icpApplicationStatusReference[ab.ApplicationStatus], "ApplicationStatusName": this.icpApplicationStatusReference[ab.ApplicationStatus],
"created_at": new Date(), "created_at": new Date(),
//2021-3-18 addNew //之前阿里的操作
"CertificateNumber": ab.CertificateNumber || "",//证书编号 "CertificateNumber": ab.CertificateNumber || "",//证书编号
"CertificateStartTime": ab.CertificateStartTime || "",//证书有效期 开始时间 "CertificateStartTime": ab.CertificateStartTime || "",//证书有效期 开始时间
"CertificateEndTime": ab.CertificateEndTime || ""//证书有效期 结束时间 "CertificateEndTime": ab.CertificateEndTime || ""//证书有效期 结束时间
}; };
} else {
statusObj = {
"OfficialFileURL": ab.OfficialFileURL || "",
"ApplicationStatus": ab.ApplicationStatus,
"ApplicationStatusName": this.icpApplicationStatusReference[ab.ApplicationStatus],
"created_at": new Date()
};
}
applicationStatusList.push(statusObj); applicationStatusList.push(statusObj);
solutionContent.applicationStatusList = applicationStatusList; solutionContent.applicationStatusList = applicationStatusList;
solutionContent.applicationStatus = ab.ApplicationStatus; solutionContent.applicationStatus = ab.ApplicationStatus;
solutionContent.material = {
applyMaterial: ab.applyMaterial,
user: ab.user,
acceptNotifyFile: ab.acceptNotifyFile,
certificateFile: ab.certificateFile,
expressNum: ab.expressNum
}
needsolutioninfo.solutionContent = JSON.stringify(solutionContent); needsolutioninfo.solutionContent = JSON.stringify(solutionContent);
return await this.needsolutionDao.db.transaction(async function (t) { return await this.needsolutionDao.db.transaction(async function (t) {
...@@ -626,6 +700,7 @@ class BaseQcService { ...@@ -626,6 +700,7 @@ class BaseQcService {
statusObj["material"] = solutionContent.material; statusObj["material"] = solutionContent.material;
statusObj["uapp_id"] = uapp_id; statusObj["uapp_id"] = uapp_id;
statusObj['channelOrderNo'] = channelOrderNo; statusObj['channelOrderNo'] = channelOrderNo;
statusObj["interface_param"] = solutionContent.interface_param;
return system.getResultSuccess(statusObj); return system.getResultSuccess(statusObj);
}) })
} catch (e) { } catch (e) {
......
center-order/app/config/settings.js
...@@ -130,6 +130,16 @@ var settings = { ...@@ -130,6 +130,16 @@ var settings = {
}, },
addArr: function () { addArr: function () {
return ["南海诸岛", "北京", "天津", "上海", "重庆", "河北", "河南", "云南", "辽宁", "黑龙江", "湖南", "安徽", "山东", "新疆", "江苏", "浙江", "江西", "湖北", "广西", "甘肃", "山西", "内蒙古", "陕西", "吉林", "福建", "贵州", "广东", "青海", "西藏", "四川", "宁夏", "海南", "台湾", "香港", "澳门"] return ["南海诸岛", "北京", "天津", "上海", "重庆", "河北", "河南", "云南", "辽宁", "黑龙江", "湖南", "安徽", "山东", "新疆", "江苏", "浙江", "江西", "湖北", "广西", "甘肃", "山西", "内蒙古", "陕西", "吉林", "福建", "贵州", "广东", "青海", "西藏", "四川", "宁夏", "海南", "台湾", "香港", "澳门"]
},
icpDeliveryStatusReference: function () {
return {
507: {key: "ACCOUNT_REGISTERED", value: "完成账户注册"},
508: {key: "MATERIAL_SUBMITTED", value: "完成资料递交"},
509: {key: "GXB_ACCEPT", value: "⼯信部已受理"},
510: {key: "GXB_REFUSE", value: "⼯信部不予受理"},
511: {key: "GXB_FAIL", value: "⼯信部未通过"},
512: {key: "GXB_SUCCESS", value: "工信部通过"}
}
} }
}; };
module.exports = settings; module.exports = settings;
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