Skip to content

Z
zhichan
Commit 06934179 by 钟占达
Options

zzd

parents 26ed981a 6b34408d
Showing with 774 additions and 691 deletions
center-manage/app/base/service/impl/common/channelhandlers/tx.js
...@@ -3,639 +3,621 @@ const sha235 = require("sha256"); ...@@ -3,639 +3,621 @@ const sha235 = require("sha256");
var settings = require("../../../../../config/settings"); var settings = require("../../../../../config/settings");
class TxHandler { class TxHandler {
constructor() { constructor() {
this.icUrl = settings.icUrl() + "/web/bizchance"; this.icUrl = settings.icUrl() + "/web/bizchance";
this.userService = system.getObject("service.auth.userSve"); this.userService = system.getObject("service.auth.userSve");
this.msgService = system.getObject("service.msg.msgSve") this.msgService = system.getObject("service.msg.msgSve")
this.cacheManager = system.getObject("db.common.cacheManager"); this.cacheManager = system.getObject("db.common.cacheManager");
this.queueUrl = settings.bpushUrl(); this.queueUrl = settings.bpushUrl();
this.bookUrl = settings.bookUrl() + "/web/bizchance"; this.bookUrl = settings.bookUrl() + "/web/bizchance";
} }
/** /**
* 需要调用生成者接口，把数据丢入队列 * 需要调用生成者接口，把数据丢入队列
* 组装生产者需要的数据结构 * 组装生产者需要的数据结构
* @param {*} datajson * @param {*} datajson
*/ */
//新商机处理 //新商机处理
async addChance(datajson) { async addChance(datajson) {
console.log("put in queue", datajson); console.log("put in queue", datajson);
try { try {
var cachestr = sha235(JSON.stringify(datajson)); var cachestr = sha235(JSON.stringify(datajson));
var cacheInfo = await this.cacheManager["TxCache"].getCache(cachestr); var cacheInfo = await this.cacheManager["TxCache"].getCache(cachestr);
if (cacheInfo && cacheInfo != 'undefined') { if (cacheInfo && cacheInfo != 'undefined') {
return { return {
"status": 1, //1代表成功，否则失败 "status": 1, //1代表成功，否则失败
"msg": "已处理成功!", "msg": "已处理成功!",
"data": "", "data": "",
"requestId": "" "requestId": ""
} }
} else {
//获取分配的业务员信息
var ConsultTypeName = datajson.actionBody.ConsultTypeName.split("/")[2];
var salesmanInfo = await this.userService.getBizUserForBizChance(datajson.actionBody.ContactsMobile, datajson.actionBody.ServicerName, ConsultTypeName, datajson.actionBody.RegionName);
console.log("salesman ------- ");
console.log(salesmanInfo);
var rc = system.getObject("util.execClient");
var requrl = this.icUrl + "/bizoptCtl/insertInfo";
var params = {
"businessMode": datajson.actionBody.NeedNum,
"servicerName": datajson.actionBody.ServicerName,
"serviceCode": datajson.actionBody.RegionId,
"serviceName": datajson.actionBody.RegionName,
"contactsName": datajson.actionBody.ContactsName,
"contactsPhone": datajson.actionBody.ContactsMobile,
"businessType": datajson.actionBody.ConsultType,
"businessName": datajson.actionBody.ConsultTypeName,
"currentStatus": "beforeSubmission",
"channelSource": "tencentCloud", //渠道
"channelNumber": "tx"
}
if (datajson.actionBody.Notes && datajson.actionBody.Notes != 'undefined') {
params.memoInfo = datajson.actionBody.Notes;
}
if (datajson.actionBody.CompanyName && datajson.actionBody.CompanyName != 'undefined') {
params.companyName = datajson.actionBody.CompanyName;
}
if (datajson.actionBody.UserName && datajson.actionBody.UserName != 'undefined') {
params.UserName = datajson.actionBody.UserName;
}
if (salesmanInfo.comInfo) {
params.servicerCode = salesmanInfo.comInfo.compId
}
if (salesmanInfo.userInfo && salesmanInfo.userInfo != 'undefined') {
params.salesmanOpcode = salesmanInfo.userInfo.opath;
params.salesmanId = salesmanInfo.userInfo.userId;
params.clerkName = salesmanInfo.userInfo.userName;
params.clerkPhone = system.encryptStr(salesmanInfo.userInfo.mobile);
}
var rtn = await rc.execPost3({ "d": params }, requrl);
var j = JSON.parse(rtn.stdout);
console.log(JSON.stringify(j), "RRRRRRRRRRRRRRR");
if (j.status == 1) {
await this.cacheManager["TxCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180); //插入redis缓存
//给业务员发信息
if (params.salesmanId) {
var msg = {
"title": "你有新的商机，请尽快处理",
"content": "商机编号" + params.businessMode + ",商机类型是" + params.businessName + ",服务地区是" + params.serviceName,
"sender": "管理员",
"sender_id": 0,
"msgType": "single",
"target": { "id": params.salesmanId, "name": params.clerkName },
}
if (params.businessType == "/qcfw/icp/" || params.businessType == "/qcfw/edi/" || params.businessType == "/qcfw/icpannals/" || params.businessType == "/qcfw/ediannals/") {
msg.app_key = "5ae2da88-0ced-4b7a-98ea-60d5e1ff7e2e";
msg.jump_address = "allDispose"
} else { } else {
//获取分配的业务员信息 msg.app_key = "42d814c1-4daa-4643-88b2-f5dd3ec853f3";
var ConsultTypeName = datajson.actionBody.ConsultTypeName.split("/")[2]; msg.jump_address = "myChance"
var salesmanInfo = await this.userService.getBizUserForBizChance(datajson.actionBody.ContactsMobile, datajson.actionBody.ServicerName, ConsultTypeName, datajson.actionBody.RegionName);
console.log("salesman ------- ");
console.log(salesmanInfo);
var rc = system.getObject("util.execClient");
var requrl = this.icUrl + "/bizoptCtl/insertInfo";
var params = {
"businessMode": datajson.actionBody.NeedNum,
"servicerName": datajson.actionBody.ServicerName,
"serviceCode": datajson.actionBody.RegionId,
"serviceName": datajson.actionBody.RegionName,
"contactsName": datajson.actionBody.ContactsName,
"contactsPhone": datajson.actionBody.ContactsMobile,
"businessType": datajson.actionBody.ConsultType,
"businessName": datajson.actionBody.ConsultTypeName,
"currentStatus": "beforeSubmission",
"channelSource": "tencentCloud", //渠道
"channelNumber": "tx"
}
if (datajson.actionBody.Notes && datajson.actionBody.Notes != 'undefined') {
params.memoInfo = datajson.actionBody.Notes;
}
if (datajson.actionBody.CompanyName && datajson.actionBody.CompanyName != 'undefined') {
params.companyName = datajson.actionBody.CompanyName;
}
if (datajson.actionBody.UserName && datajson.actionBody.UserName != 'undefined') {
params.UserName = datajson.actionBody.UserName;
}
if (salesmanInfo.comInfo) {
params.servicerCode = salesmanInfo.comInfo.compId
}
if (salesmanInfo.userInfo && salesmanInfo.userInfo != 'undefined') {
params.salesmanOpcode = salesmanInfo.userInfo.opath;
params.salesmanId = salesmanInfo.userInfo.userId;
params.clerkName = salesmanInfo.userInfo.userName;
params.clerkPhone = system.encryptStr(salesmanInfo.userInfo.mobile);
}
var rtn = await rc.execPost3({ "d": params }, requrl);
var j = JSON.parse(rtn.stdout);
console.log(JSON.stringify(j), "RRRRRRRRRRRRRRR");
if (j.status == 1) {
await this.cacheManager["TxCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180); //插入redis缓存
//给业务员发信息
if (params.salesmanId) {
var msg = {
"title": "你有新的商机，请尽快处理",
"content": "商机编号" + params.businessMode + ",商机类型是" + params.businessName + ",服务地区是" + params.serviceName,
"sender": "管理员",
"sender_id": 0,
"msgType": "single",
"target": { "id": params.salesmanId, "name": params.clerkName },
}
if (params.businessType == "/qcfw/icp/" || params.businessType == "/qcfw/edi/" || params.businessType == "/qcfw/icpannals/" || params.businessType == "/qcfw/ediannals/") {
msg.app_key = "5ae2da88-0ced-4b7a-98ea-60d5e1ff7e2e";
msg.jump_address = "allDispose"
} else {
msg.app_key = "42d814c1-4daa-4643-88b2-f5dd3ec853f3";
msg.jump_address = "myChance"
}
this.msgService.create(msg);
}
}
return j;
} }
} catch (error) { this.msgService.create(msg);
console.log("TTTTTTTTTTTTTT"); }
console.log(error);
return system.getResultError(error);
} }
return j;
}
} catch (error) {
console.log("TTTTTTTTTTTTTT");
console.log(error);
return system.getResultError(error);
} }
//退回商机处理 }
async needClose(datajson) {
console.log("put in queue" + JSON.stringify(datajson) + "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD");
try {
var cachestr = sha235(JSON.stringify(datajson));
var cacheInfo = await this.cacheManager["TxCache"].getCache(cachestr);
if (cacheInfo && cacheInfo != 'undefined') {
return {
"status": 1, //1代表成功，否则失败
"msg": "已处理成功!",
"data": "",
"requestId": ""
}
} else {
var rc = system.getObject("util.execClient");
var requrl = this.icUrl + "/schemeCtl/updateStatusByDemandCode";
var params = {
"d": {
"businessMode": datajson.actionBody.NeedNum,
"schemeNumber": datajson.actionBody.SolutionNum,
"currentStatus": "isReject",
"statusReason": datajson.actionBody.RefusalContent
}
}
var rtn = await rc.execPost3(params, requrl);
var j = JSON.parse(rtn.stdout);
if (j.status == 0) {
await this.cacheManager["TxCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180); //插入缓存
//给业务员发信息 //退回商机处理
var selUrl = this.icUrl + "/schemeCtl/findInfoByDemandCode"; async needClose(datajson) {
var selpar = { console.log("put in queue" + JSON.stringify(datajson) + "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD");
"d": { try {
"businessMode": datajson.actionBody.NeedNum var cachestr = sha235(JSON.stringify(datajson));
} var cacheInfo = await this.cacheManager["TxCache"].getCache(cachestr);
} if (cacheInfo && cacheInfo != 'undefined') {
rtn = await rc.execPost3(selpar, selUrl); return {
var jj = JSON.parse(rtn.stdout); "status": 1, //1代表成功，否则失败
console.log("jj------------------------------" + rtn.stdout); "msg": "已处理成功!",
if (jj.status == 0 && jj.data) { "data": "",
if (jj.data.clerkId) { "requestId": ""
var msg = { }
"title": "你有退回的商机，请尽快处理", } else {
"content": "商机编号" + jj.data.businessMode + ",商机类型是" + jj.data.businessName, var rc = system.getObject("util.execClient");
"sender": "管理员", var requrl = this.icUrl + "/schemeCtl/updateStatusByDemandCode";
"sender_id": 0, var params = {
"msgType": "single", "d": {
"target": { "id": jj.data.clerkId, "name": jj.data.clerkName }, "businessMode": datajson.actionBody.NeedNum,
} "schemeNumber": datajson.actionBody.SolutionNum,
if (jj.data.businessType == "ICP" || jj.data.businessType == "EDI" || jj.data.businessType == "ICPANNUALREPORT" || jj.data.businessType == "EDIANNUALREPORT") { "currentStatus": "isReject",
msg.app_key = "5ae2da88-0ced-4b7a-98ea-60d5e1ff7e2e"; "statusReason": datajson.actionBody.RefusalContent
msg.jump_address = "allDispose" }
} else { }
msg.app_key = "42d814c1-4daa-4643-88b2-f5dd3ec853f3"; var rtn = await rc.execPost3(params, requrl);
msg.jump_address = "myChance" var j = JSON.parse(rtn.stdout);
} if (j.status == 0) {
this.msgService.create(msg); await this.cacheManager["TxCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180); //插入缓存
}
}
return { //给业务员发信息
"status": 1, //1代表成功，否则失败 var selUrl = this.icUrl + "/schemeCtl/findInfoByDemandCode";
"msg": "成功", var selpar = {
"data": "", "d": {
"requestId": "" "businessMode": datajson.actionBody.NeedNum
}
} else {
return j;
}
} }
} catch (error) { }
return system.getResultError(error); rtn = await rc.execPost3(selpar, selUrl);
} var jj = JSON.parse(rtn.stdout);
console.log("jj------------------------------" + rtn.stdout);
if (jj.status == 0 && jj.data) {
if (jj.data.clerkId) {
var msg = {
"title": "你有退回的商机，请尽快处理",
"content": "商机编号" + jj.data.businessMode + ",商机类型是" + jj.data.businessName,
"sender": "管理员",
"sender_id": 0,
"msgType": "single",
"target": { "id": jj.data.clerkId, "name": jj.data.clerkName },
}
if (jj.data.businessType == "ICP" || jj.data.businessType == "EDI" || jj.data.businessType == "ICPANNUALREPORT" || jj.data.businessType == "EDIANNUALREPORT") {
msg.app_key = "5ae2da88-0ced-4b7a-98ea-60d5e1ff7e2e";
msg.jump_address = "allDispose"
} else {
msg.app_key = "42d814c1-4daa-4643-88b2-f5dd3ec853f3";
msg.jump_address = "myChance"
}
this.msgService.create(msg);
}
}
return {
"status": 1, //1代表成功，否则失败
"msg": "成功",
"data": "",
"requestId": ""
}
} else {
return j;
}
}
} catch (error) {
return system.getResultError(error);
} }
//交付单处理 }
async orderSubmit(datajson) {
console.log("put in queue-----------------------------------------------------------------------------------------------------", datajson);
try {
var cachestr = sha235(JSON.stringify(datajson));
var cacheInfo = await this.cacheManager["TxCache"].getCache(cachestr);
if (cacheInfo && cacheInfo != 'undefined') {
return {
"status": 1, //1代表成功，否则失败
"msg": "已处理成功!",
"data": "",
"requestId": ""
}
} else {
var rc = system.getObject("util.execClient");
var requrl = this.icUrl + "/deliverybillCtl/findInfoByDeliverCode";
var delInfo = await rc.execPost3({ "d": { "deliverNumber": datajson.actionBody.orderNum } }, requrl);
console.log("jdelInfo---------------------------------------------" + delInfo.stdout);
var jdelInfo = JSON.parse(delInfo.stdout);
if (jdelInfo.status == 0) {
return {
"status": 1, //1代表成功，否则失败
"msg": "数据已存在",
"data": "",
"requestId": ""
}
} else {
//获取分配的业务员信息
var ConsultTypeName = "";
console.log("productTypeName-----------------------------" + datajson.actionBody.productTypeName);
if (datajson.actionBody.productTypeName && datajson.actionBody.productTypeName != 'undefined') {
ConsultTypeName = datajson.actionBody.productTypeName.split("/")[2];
}
console.log("ConsultTypeName-----------------------------" + ConsultTypeName);
var salesmanInfo = await this.userService.getBizUserForDelivery(datajson.actionBody.orderSnapshot.contactsPhone, datajson.actionBody.servicerName, ConsultTypeName, datajson.actionBody.txPriceCode, datajson.actionBody.regionName);
requrl = this.icUrl + "/deliverybillCtl/insertInfo";
var bizurl = this.icUrl + "/bizoptCtl/updateStatusByDemandCode";
var params = {
"channelSource": "tencentCloud", //渠道
"channelNumber": "tx",
"deliverNumber": datajson.actionBody.orderNum,
"servicerName": datajson.actionBody.servicerName,
"serviceCode": datajson.actionBody.regionId,
"serviceName": datajson.actionBody.regionName,
"businessType": datajson.actionBody.productType,
"businessName": ConsultTypeName,
"skuCode": datajson.actionBody.txPriceCode,
"txOrderNum": datajson.actionBody.txOrderNum,
"deliverStatus": "received",
"baseInfo": {
"txOrderNum": datajson.actionBody.txOrderNum,
"isAdviser": "已分配", //是否分配顾问
"contactsName": datajson.actionBody.orderSnapshot.contactsName,
"contactsPhone": datajson.actionBody.orderSnapshot.contactsPhone,
"payStatus": "待交付"
},
"companyInfo": {},
"registeredInfo": {},
"positionInfo": {},
"regInfo": {},
"express_info": {}
}
if (salesmanInfo.comInfo) {
params.costPrice = salesmanInfo.comInfo.cost;
params.servicerCode = salesmanInfo.comInfo.compId;
}
//设置成本 tocheck
let costprice = await this.userService.findCostBySkuCode(datajson.actionBody.txPriceCode)
params.costPrice = costprice
if (salesmanInfo.userInfo && salesmanInfo.userInfo != 'undefined') { //交付单处理
params.clerkOpcode = salesmanInfo.userInfo.opath; async orderSubmit(datajson) {
params.clerkId = salesmanInfo.userInfo.userId; console.log("put in queue-----------------------------------------------------------------------------------------------------", datajson);
params.clerkName = salesmanInfo.userInfo.userName; try {
//params.clerkPhone = salesmanInfo.userInfo.mobile; var cachestr = sha235(JSON.stringify(datajson));
params.baseInfo.clerkName = salesmanInfo.userInfo.userName; var cacheInfo = await this.cacheManager["TxCache"].getCache(cachestr);
// params.baseInfo.clerkPhone = salesmanInfo.userInfo.mobile if (cacheInfo && cacheInfo != 'undefined') {
} return {
// if (!params.servicerCode || params.servicerCode == 'undefined') { "status": 1, //1代表成功，否则失败
// if (datajson.actionBody.orderSnapshot.servicerCode && datajson.actionBody.orderSnapshot.servicerCode != 'undefined') { "msg": "已处理成功!",
// params.servicerCode = datajson.actionBody.orderSnapshot.servicerCode;//fuwushang id "data": "",
// } "requestId": ""
// } }
if (datajson.actionBody.orderSnapshot.needNum && datajson.actionBody.orderSnapshot.needNum != 'undefined') { } else {
params.businessMode = datajson.actionBody.orderSnapshot.needNum; //商机编号 var rc = system.getObject("util.execClient");
} var requrl = this.icUrl + "/deliverybillCtl/findInfoByDeliverCode";
if (datajson.actionBody.realTotalCost && datajson.actionBody.realTotalCost != 'undefined') { var delInfo = await rc.execPost3({ "d": { "deliverNumber": datajson.actionBody.orderNum } }, requrl);
params.sellingPrice = datajson.actionBody.realTotalCost; //价格 console.log("jdelInfo---------------------------------------------" + delInfo.stdout);
} var jdelInfo = JSON.parse(delInfo.stdout);
// if (datajson.actionBody.orderSnapshot.channelSource && datajson.actionBody.orderSnapshot.channelSource != 'undefined') { if (jdelInfo.status == 0) {
// params.channelSource = datajson.actionBody.orderSnapshot.channelSource;//渠道名称 return {
// } "status": 1, //1代表成功，否则失败
// if (datajson.actionBody.orderSnapshot.channelNumber && datajson.actionBody.orderSnapshot.channelNumber != 'undefined') { "msg": "数据已存在",
// params.channelNumber = datajson.actionBody.orderSnapshot.channelNumber;//渠道编码 "data": "",
// } "requestId": ""
if (datajson.actionBody.orderSnapshot.hasOwnProperty("isWhether")) { }
if (datajson.actionBody.orderSnapshot.isWhether === true || datajson.actionBody.orderSnapshot.isWhether === "yes") { } else {
params.baseInfo.isWhether = "yes"; //是否刻章 //获取分配的业务员信息
} else { var ConsultTypeName = "";
params.baseInfo.isWhether = "no"; //是否刻章 console.log("productTypeName-----------------------------" + datajson.actionBody.productTypeName);
} if (datajson.actionBody.productTypeName && datajson.actionBody.productTypeName != 'undefined') {
} else { ConsultTypeName = datajson.actionBody.productTypeName.split("/")[2];
if (datajson.actionBody.contextOrderCount && datajson.actionBody.contextOrderCount != 'undefined' && datajson.actionBody.contextOrderCount > 1) { }
params.baseInfo.isWhether = "yes"; console.log("ConsultTypeName-----------------------------" + ConsultTypeName);
} else { var salesmanInfo = await this.userService.getBizUserForDelivery(datajson.actionBody.orderSnapshot.contactsPhone, datajson.actionBody.servicerName, ConsultTypeName, datajson.actionBody.txPriceCode, datajson.actionBody.regionName);
params.baseInfo.isWhether = "no"; requrl = this.icUrl + "/deliverybillCtl/insertInfo";
} var bizurl = this.icUrl + "/bizoptCtl/updateStatusByDemandCode";
} var params = {
if (datajson.actionBody.orderSnapshot.hasOwnProperty("financial")) { "channelSource": "tencentCloud", //渠道
if (datajson.actionBody.orderSnapshot.financial === true || datajson.actionBody.orderSnapshot.financial === "yes") { "channelNumber": "tx",
params.baseInfo.financial = "yes"; "deliverNumber": datajson.actionBody.orderNum,
} else { "servicerName": datajson.actionBody.servicerName,
params.baseInfo.financial = "no"; "serviceCode": datajson.actionBody.regionId,
} "serviceName": datajson.actionBody.regionName,
} else { "businessType": datajson.actionBody.productType,
if (datajson.actionBody.contextOrderCount && datajson.actionBody.contextOrderCount != 'undefined' && datajson.actionBody.contextOrderCount > 1) { "businessName": ConsultTypeName,
params.baseInfo.financial = "yes"; "skuCode": datajson.actionBody.txPriceCode,
} else { "txOrderNum": datajson.actionBody.txOrderNum,
params.baseInfo.financial = "no"; "deliverStatus": "received",
} "baseInfo": {
} "txOrderNum": datajson.actionBody.txOrderNum,
if (datajson.actionBody.orderSnapshot.officialSeal && datajson.actionBody.orderSnapshot.officialSeal != 'undefined') { "isAdviser": "已分配", //是否分配顾问
params.baseInfo.officialSeal = datajson.actionBody.orderSnapshot.officialSeal; //公章扫描件 "contactsName": datajson.actionBody.orderSnapshot.contactsName,
} "contactsPhone": datajson.actionBody.orderSnapshot.contactsPhone,
if (datajson.actionBody.orderSnapshot.businessLicense && datajson.actionBody.orderSnapshot.businessLicense != 'undefined') { "payStatus": "待交付"
params.baseInfo.businessLicense = datajson.actionBody.orderSnapshot.businessLicense; //营业执照扫描件 },
} "companyInfo": {},
if (datajson.actionBody.orderSnapshot.taxpayerName && datajson.actionBody.orderSnapshot.taxpayerName != 'undefined') { "registeredInfo": {},
params.baseInfo.taxpayerName = datajson.actionBody.orderSnapshot.taxpayerName; //纳税人类型名称 "positionInfo": {},
} else if (datajson.actionBody.orderSnapshot.taxpayerType && datajson.actionBody.orderSnapshot.taxpayerType != 'undefined') { "regInfo": {},
params.baseInfo.taxpayerName = datajson.actionBody.orderSnapshot.taxpayerType; //纳税人类型名称 "express_info": {}
} }
if (datajson.actionBody.orderSnapshot.buyDuration && datajson.actionBody.orderSnapshot.buyDuration != 'undefined') { if (salesmanInfo.comInfo) {
params.baseInfo.buyDuration = datajson.actionBody.orderSnapshot.buyDuration; //购买时长 params.costPrice = salesmanInfo.comInfo.cost;
} else if (datajson.actionBody.orderSnapshot.timeSpan && datajson.actionBody.orderSnapshot.timeSpan != 'undefined') { params.servicerCode = salesmanInfo.comInfo.compId;
params.baseInfo.buyDuration = datajson.actionBody.orderSnapshot.timeSpan + "年"; //购买时长 }
} //设置成本 tocheck
if (datajson.actionBody.orderSnapshot.buyTime && datajson.actionBody.orderSnapshot.buyTime != 'undefined') { let costprice = await this.userService.findCostBySkuCode(datajson.actionBody.txPriceCode)
params.baseInfo.buyTime = datajson.actionBody.orderSnapshot.buyTime; //购买时间 params.costPrice = costprice
}
if (datajson.actionBody.orderSnapshot.isRenew && datajson.actionBody.orderSnapshot.isRenew != 'undefined') {
params.baseInfo.isRenew = datajson.actionBody.orderSnapshot.isRenew; //是否自动续费
}
if (datajson.actionBody.orderSnapshot.memoInfo && datajson.actionBody.orderSnapshot.memoInfo != 'undefined') {
params.baseInfo.memoInfo = datajson.actionBody.orderSnapshot.memoInfo;
} else if (datajson.actionBody.orderSnapshot.businessContent && datajson.actionBody.orderSnapshot.businessContent != 'undefined') {
params.baseInfo.memoInfo = datajson.actionBody.orderSnapshot.businessContent;
}
if (datajson.actionBody.orderSnapshot.whetherType && datajson.actionBody.orderSnapshot.whetherType != 'undefined') {
params.baseInfo.whetherType = datajson.actionBody.orderSnapshot.whetherType; //刻章类型
}
if (datajson.actionBody.orderSnapshot.hasOwnProperty("annualReport")) { //年报信息
params.baseInfo.annualReport = datajson.actionBody.orderSnapshot.annualReport;
} else {
if (datajson.actionBody.orderSnapshot.annual_report && datajson.actionBody.orderSnapshot.annual_report != 'undefined') {
params.baseInfo.annualReport = true; //shifouxuyaonianbao
} else {
params.baseInfo.annualReport = false;
}
}
if (datajson.actionBody.orderSnapshot.hasOwnProperty("addressType")) { //注册地址类型
if (datajson.actionBody.orderSnapshot.addressType === true || datajson.actionBody.orderSnapshot.addressType === "practical") {
params.baseInfo.addressType = "practical";
} else {
params.baseInfo.addressType = "virtual";
}
}
if (datajson.actionBody.orderSnapshot.subjectType && datajson.actionBody.orderSnapshot.subjectType != 'undefined') {
params.baseInfo.subjectType = datajson.actionBody.orderSnapshot.subjectType; //代理记账主体类型
}
if (datajson.actionBody.orderSnapshot.companyName && datajson.actionBody.orderSnapshot.companyName != 'undefined') {
params.baseInfo.companyName = datajson.actionBody.orderSnapshot.companyName; //公司名称
params.companyInfo.companyName = datajson.actionBody.orderSnapshot.companyName;
} else if (datajson.actionBody.orderSnapshot.company && datajson.actionBody.orderSnapshot.company != 'undefined') {
params.baseInfo.companyName = datajson.actionBody.orderSnapshot.company; //公司名称
params.companyInfo.companyName = datajson.actionBody.orderSnapshot.company;
}
if (datajson.actionBody.orderSnapshot.companyProperties && datajson.actionBody.orderSnapshot.companyProperties != 'undefined') {
params.companyInfo.companyPropertiesName = datajson.actionBody.orderSnapshot.companyProperties; //公司性质名称
} else if (datajson.actionBody.orderSnapshot.companyType && datajson.actionBody.orderSnapshot.companyType != 'undefined') {
params.companyInfo.companyPropertiesName = datajson.actionBody.orderSnapshot.companyType; //公司性质名称
} else if (datajson.actionBody.orderSnapshot.registeredName && datajson.actionBody.orderSnapshot.registeredName != 'undefined') {
params.companyInfo.companyPropertiesName = datajson.actionBody.orderSnapshot.registeredName; //公司性质名称
}
if (datajson.actionBody.orderSnapshot.fullAddress && datajson.actionBody.orderSnapshot.fullAddress != 'undefined') {
params.companyInfo.fullAddress = datajson.actionBody.orderSnapshot.fullAddress; //详细地址
} else if (datajson.actionBody.orderSnapshot.residenceAddress && datajson.actionBody.orderSnapshot.residenceAddress != 'undefined') {
params.companyInfo.fullAddress = datajson.actionBody.orderSnapshot.residenceAddress; //详细地址
}
if (datajson.actionBody.orderSnapshot.virtualPrice && datajson.actionBody.orderSnapshot.virtualPrice != 'undefined') {
params.companyInfo.virtualPrice = datajson.actionBody.orderSnapshot.virtualPrice; //虚拟地址价格
params.baseInfo.virtualPrice = datajson.actionBody.orderSnapshot.virtualPrice; //虚拟地址价格
}
if (datajson.actionBody.orderSnapshot.residenceAddress && datajson.actionBody.orderSnapshot.residenceAddress != 'undefined') {
params.companyInfo.residenceAddress = datajson.actionBody.orderSnapshot.residenceAddress; //zhusuo
}
if (datajson.actionBody.orderSnapshot.engagedIndustry && datajson.actionBody.orderSnapshot.engagedIndustry != 'undefined') {
params.companyInfo.engagedIndName = datajson.actionBody.orderSnapshot.engagedIndustry; //从事行业名称
}
if (datajson.actionBody.orderSnapshot.businessScope && datajson.actionBody.orderSnapshot.businessScope != 'undefined') {
params.companyInfo.businessScope = datajson.actionBody.orderSnapshot.businessScope; //经营范围
}
if (datajson.actionBody.orderSnapshot.operatingPeriod && datajson.actionBody.orderSnapshot.operatingPeriod != 'undefined') {
params.companyInfo.operatingPeriod = datajson.actionBody.orderSnapshot.operatingPeriod; //经营期限
}
if (datajson.actionBody.orderSnapshot.businessTerm && datajson.actionBody.orderSnapshot.businessTerm != 'undefined') {
params.companyInfo.businessTerm = datajson.actionBody.orderSnapshot.businessTerm; //经营期限
}
if (datajson.actionBody.orderSnapshot.registeredCapital && datajson.actionBody.orderSnapshot.registeredCapital != 'undefined') {
params.companyInfo.registeredCapital = datajson.actionBody.orderSnapshot.registeredCapital; //注册资本
}
if (datajson.actionBody.orderSnapshot.creditCode && datajson.actionBody.orderSnapshot.creditCode != 'undefined') {
params.companyInfo.creditCode = datajson.actionBody.orderSnapshot.creditCode; //统一社会信用代码
}
if (datajson.actionBody.orderSnapshot.establishedTime && datajson.actionBody.orderSnapshot.establishedTime != 'undefined') {
params.companyInfo.establishedTime = datajson.actionBody.orderSnapshot.establishedTime; //成立时间
}
if (datajson.actionBody.orderSnapshot.shareholderName && datajson.actionBody.orderSnapshot.shareholderName != 'undefined') {
params.companyInfo.shareholderName = datajson.actionBody.orderSnapshot.shareholderName; //法人代表
}
if (salesmanInfo.userInfo && salesmanInfo.userInfo != 'undefined') {
params.clerkOpcode = salesmanInfo.userInfo.opath;
params.clerkId = salesmanInfo.userInfo.userId;
params.clerkName = salesmanInfo.userInfo.userName;
//params.clerkPhone = salesmanInfo.userInfo.mobile;
params.baseInfo.clerkName = salesmanInfo.userInfo.userName;
// params.baseInfo.clerkPhone = salesmanInfo.userInfo.mobile
}
// if (!params.servicerCode || params.servicerCode == 'undefined') {
// if (datajson.actionBody.orderSnapshot.servicerCode && datajson.actionBody.orderSnapshot.servicerCode != 'undefined') {
// params.servicerCode = datajson.actionBody.orderSnapshot.servicerCode;//fuwushang id
// }
// }
if (datajson.actionBody.orderSnapshot.needNum && datajson.actionBody.orderSnapshot.needNum != 'undefined') {
params.businessMode = datajson.actionBody.orderSnapshot.needNum; //商机编号
}
if (datajson.actionBody.realTotalCost && datajson.actionBody.realTotalCost != 'undefined') {
params.sellingPrice = datajson.actionBody.realTotalCost; //价格
}
// if (datajson.actionBody.orderSnapshot.channelSource && datajson.actionBody.orderSnapshot.channelSource != 'undefined') {
// params.channelSource = datajson.actionBody.orderSnapshot.channelSource;//渠道名称
// }
// if (datajson.actionBody.orderSnapshot.channelNumber && datajson.actionBody.orderSnapshot.channelNumber != 'undefined') {
// params.channelNumber = datajson.actionBody.orderSnapshot.channelNumber;//渠道编码
// }
if (datajson.actionBody.orderSnapshot.hasOwnProperty("isWhether")) {
if (datajson.actionBody.orderSnapshot.isWhether === true || datajson.actionBody.orderSnapshot.isWhether === "yes") {
params.baseInfo.isWhether = "yes"; //是否刻章
} else {
params.baseInfo.isWhether = "no"; //是否刻章
}
} else {
if (datajson.actionBody.contextOrderCount && datajson.actionBody.contextOrderCount != 'undefined' && datajson.actionBody.contextOrderCount > 1) {
params.baseInfo.isWhether = "yes";
} else {
params.baseInfo.isWhether = "no";
}
}
if (datajson.actionBody.orderSnapshot.hasOwnProperty("financial")) {
if (datajson.actionBody.orderSnapshot.financial === true || datajson.actionBody.orderSnapshot.financial === "yes") {
params.baseInfo.financial = "yes";
} else {
params.baseInfo.financial = "no";
}
} else {
if (datajson.actionBody.contextOrderCount && datajson.actionBody.contextOrderCount != 'undefined' && datajson.actionBody.contextOrderCount > 1) {
params.baseInfo.financial = "yes";
} else {
params.baseInfo.financial = "no";
}
}
if (datajson.actionBody.orderSnapshot.officialSeal && datajson.actionBody.orderSnapshot.officialSeal != 'undefined') {
params.baseInfo.officialSeal = datajson.actionBody.orderSnapshot.officialSeal; //公章扫描件
}
if (datajson.actionBody.orderSnapshot.businessLicense && datajson.actionBody.orderSnapshot.businessLicense != 'undefined') {
params.baseInfo.businessLicense = datajson.actionBody.orderSnapshot.businessLicense; //营业执照扫描件
}
if (datajson.actionBody.orderSnapshot.taxpayerName && datajson.actionBody.orderSnapshot.taxpayerName != 'undefined') {
params.baseInfo.taxpayerName = datajson.actionBody.orderSnapshot.taxpayerName; //纳税人类型名称
} else if (datajson.actionBody.orderSnapshot.taxpayerType && datajson.actionBody.orderSnapshot.taxpayerType != 'undefined') {
params.baseInfo.taxpayerName = datajson.actionBody.orderSnapshot.taxpayerType; //纳税人类型名称
}
if (datajson.actionBody.orderSnapshot.buyDuration && datajson.actionBody.orderSnapshot.buyDuration != 'undefined') {
params.baseInfo.buyDuration = datajson.actionBody.orderSnapshot.buyDuration; //购买时长
} else if (datajson.actionBody.orderSnapshot.timeSpan && datajson.actionBody.orderSnapshot.timeSpan != 'undefined') {
params.baseInfo.buyDuration = datajson.actionBody.orderSnapshot.timeSpan + "年"; //购买时长
}
if (datajson.actionBody.orderSnapshot.buyTime && datajson.actionBody.orderSnapshot.buyTime != 'undefined') {
params.baseInfo.buyTime = datajson.actionBody.orderSnapshot.buyTime; //购买时间
}
if (datajson.actionBody.orderSnapshot.isRenew && datajson.actionBody.orderSnapshot.isRenew != 'undefined') {
params.baseInfo.isRenew = datajson.actionBody.orderSnapshot.isRenew; //是否自动续费
}
if (datajson.actionBody.orderSnapshot.memoInfo && datajson.actionBody.orderSnapshot.memoInfo != 'undefined') {
params.baseInfo.memoInfo = datajson.actionBody.orderSnapshot.memoInfo;
} else if (datajson.actionBody.orderSnapshot.businessContent && datajson.actionBody.orderSnapshot.businessContent != 'undefined') {
params.baseInfo.memoInfo = datajson.actionBody.orderSnapshot.businessContent;
}
if (datajson.actionBody.orderSnapshot.whetherType && datajson.actionBody.orderSnapshot.whetherType != 'undefined') {
params.baseInfo.whetherType = datajson.actionBody.orderSnapshot.whetherType; //刻章类型
}
if (datajson.actionBody.orderSnapshot.hasOwnProperty("annualReport")) { //年报信息
params.baseInfo.annualReport = datajson.actionBody.orderSnapshot.annualReport;
} else {
if (datajson.actionBody.orderSnapshot.annual_report && datajson.actionBody.orderSnapshot.annual_report != 'undefined') {
params.baseInfo.annualReport = true; //shifouxuyaonianbao
} else {
params.baseInfo.annualReport = false;
}
}
if (datajson.actionBody.orderSnapshot.hasOwnProperty("addressType")) { //注册地址类型
if (datajson.actionBody.orderSnapshot.addressType === true || datajson.actionBody.orderSnapshot.addressType === "practical") {
params.baseInfo.addressType = "practical";
} else {
params.baseInfo.addressType = "virtual";
}
}
if (datajson.actionBody.orderSnapshot.subjectType && datajson.actionBody.orderSnapshot.subjectType != 'undefined') {
params.baseInfo.subjectType = datajson.actionBody.orderSnapshot.subjectType; //代理记账主体类型
}
if (datajson.actionBody.orderSnapshot.companyName && datajson.actionBody.orderSnapshot.companyName != 'undefined') {
params.baseInfo.companyName = datajson.actionBody.orderSnapshot.companyName; //公司名称
params.companyInfo.companyName = datajson.actionBody.orderSnapshot.companyName;
} else if (datajson.actionBody.orderSnapshot.company && datajson.actionBody.orderSnapshot.company != 'undefined') {
params.baseInfo.companyName = datajson.actionBody.orderSnapshot.company; //公司名称
params.companyInfo.companyName = datajson.actionBody.orderSnapshot.company;
}
if (datajson.actionBody.orderSnapshot.companyProperties && datajson.actionBody.orderSnapshot.companyProperties != 'undefined') {
params.companyInfo.companyPropertiesName = datajson.actionBody.orderSnapshot.companyProperties; //公司性质名称
} else if (datajson.actionBody.orderSnapshot.companyType && datajson.actionBody.orderSnapshot.companyType != 'undefined') {
params.companyInfo.companyPropertiesName = datajson.actionBody.orderSnapshot.companyType; //公司性质名称
} else if (datajson.actionBody.orderSnapshot.registeredName && datajson.actionBody.orderSnapshot.registeredName != 'undefined') {
params.companyInfo.companyPropertiesName = datajson.actionBody.orderSnapshot.registeredName; //公司性质名称
}
if (datajson.actionBody.orderSnapshot.fullAddress && datajson.actionBody.orderSnapshot.fullAddress != 'undefined') {
params.companyInfo.fullAddress = datajson.actionBody.orderSnapshot.fullAddress; //详细地址
} else if (datajson.actionBody.orderSnapshot.residenceAddress && datajson.actionBody.orderSnapshot.residenceAddress != 'undefined') {
params.companyInfo.fullAddress = datajson.actionBody.orderSnapshot.residenceAddress; //详细地址
}
if (datajson.actionBody.orderSnapshot.virtualPrice && datajson.actionBody.orderSnapshot.virtualPrice != 'undefined') {
params.companyInfo.virtualPrice = datajson.actionBody.orderSnapshot.virtualPrice; //虚拟地址价格
params.baseInfo.virtualPrice = datajson.actionBody.orderSnapshot.virtualPrice; //虚拟地址价格
}
if (datajson.actionBody.orderSnapshot.residenceAddress && datajson.actionBody.orderSnapshot.residenceAddress != 'undefined') {
params.companyInfo.residenceAddress = datajson.actionBody.orderSnapshot.residenceAddress; //zhusuo
}
if (datajson.actionBody.orderSnapshot.engagedIndustry && datajson.actionBody.orderSnapshot.engagedIndustry != 'undefined') {
params.companyInfo.engagedIndName = datajson.actionBody.orderSnapshot.engagedIndustry; //从事行业名称
}
if (datajson.actionBody.orderSnapshot.businessScope && datajson.actionBody.orderSnapshot.businessScope != 'undefined') {
params.companyInfo.businessScope = datajson.actionBody.orderSnapshot.businessScope; //经营范围
}
if (datajson.actionBody.orderSnapshot.operatingPeriod && datajson.actionBody.orderSnapshot.operatingPeriod != 'undefined') {
params.companyInfo.operatingPeriod = datajson.actionBody.orderSnapshot.operatingPeriod; //经营期限
}
if (datajson.actionBody.orderSnapshot.businessTerm && datajson.actionBody.orderSnapshot.businessTerm != 'undefined') {
params.companyInfo.businessTerm = datajson.actionBody.orderSnapshot.businessTerm; //经营期限
}
if (datajson.actionBody.orderSnapshot.registeredCapital && datajson.actionBody.orderSnapshot.registeredCapital != 'undefined') {
params.companyInfo.registeredCapital = datajson.actionBody.orderSnapshot.registeredCapital; //注册资本
}
if (datajson.actionBody.orderSnapshot.creditCode && datajson.actionBody.orderSnapshot.creditCode != 'undefined') {
params.companyInfo.creditCode = datajson.actionBody.orderSnapshot.creditCode; //统一社会信用代码
}
if (datajson.actionBody.orderSnapshot.establishedTime && datajson.actionBody.orderSnapshot.establishedTime != 'undefined') {
params.companyInfo.establishedTime = datajson.actionBody.orderSnapshot.establishedTime; //成立时间
}
if (datajson.actionBody.orderSnapshot.shareholderName && datajson.actionBody.orderSnapshot.shareholderName != 'undefined') {
params.companyInfo.shareholderName = datajson.actionBody.orderSnapshot.shareholderName; //法人代表
}
var rtn = await rc.execPost3({ "d": params }, requrl);
var j = JSON.parse(rtn.stdout);
console.log("j---------------------------------" + rtn.stdout);
var j1 = 0;
if (params.businessMode && params.businessMode != 'undefined') {
var stau = {
"businessMode": params.businessMode,
"currentStatus": "isFinished",
"statusReason": ""
}
rtn = await rc.execPost3({ "d": stau }, bizurl); //更新商机状态为已完成
j1 = JSON.parse(rtn.stdout);
console.log("j1---------------------------------" + rtn.stdout);
} var rtn = await rc.execPost3({ "d": params }, requrl);
if (j.status == 0 && j1.status == 0) { var j = JSON.parse(rtn.stdout);
await this.cacheManager["TxCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180); console.log("j---------------------------------" + rtn.stdout);
//给业务员发信息 var j1 = 0;
var msg = { if (params.businessMode && params.businessMode != 'undefined') {
"title": "你有新的交付单，请尽快处理", var stau = {
"content": "交付单编号" + params.deliverNumber + ",产品类型是" + params.businessName + ",服务地区是" + params.serviceName, "businessMode": params.businessMode,
"sender": "管理员", "currentStatus": "isFinished",
"sender_id": 0, "statusReason": ""
"msgType": "single",
"target": { "id": params.clerkId, "name": params.clerkName },
}
if (params.businessType == "/qcfw/icp/" || params.businessType == "/qcfw/edi/" || params.businessType == "/qcfw/icpannals/" || params.businessType == "/qcfw/ediannals/") {
msg.app_key = "5ae2da88-0ced-4b7a-98ea-60d5e1ff7e2e";
msg.jump_address = "deliveryAll"
} else {
msg.app_key = "42d814c1-4daa-4643-88b2-f5dd3ec853f3";
msg.jump_address = "myDeliver"
}
this.msgService.create(msg);
return {
"status": 1, //1代表成功，否则失败
"msg": "",
"data": "",
"requestId": ""
}
} else {
return j;
}
}
} }
} catch (error) { rtn = await rc.execPost3({ "d": stau }, bizurl); //更新商机状态为已完成
console.log("error-------------------------------------" + error); j1 = JSON.parse(rtn.stdout);
return system.getResultError(error); console.log("j1---------------------------------" + rtn.stdout);
}
}
//关闭交付单处理 }
async orderClose(datajson) { if (j.status == 0 && j1.status == 0) {
console.log("put in queue", datajson); await this.cacheManager["TxCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180);
try { //给业务员发信息
var cachestr = sha235(JSON.stringify(datajson)); var msg = {
var cacheInfo = await this.cacheManager["TxCache"].getCache(cachestr); "title": "你有新的交付单，请尽快处理",
if (cacheInfo && cacheInfo != 'undefined') { "content": "交付单编号" + params.deliverNumber + ",产品类型是" + params.businessName + ",服务地区是" + params.serviceName,
return { "sender": "管理员",
"status": 1, //1代表成功，否则失败 "sender_id": 0,
"msg": "已处理成功!", "msgType": "single",
"data": "", "target": { "id": params.clerkId, "name": params.clerkName },
"requestId": "" }
} if (params.businessType == "/qcfw/icp/" || params.businessType == "/qcfw/edi/" || params.businessType == "/qcfw/icpannals/" || params.businessType == "/qcfw/ediannals/") {
msg.app_key = "5ae2da88-0ced-4b7a-98ea-60d5e1ff7e2e";
msg.jump_address = "deliveryAll"
} else { } else {
var rc = system.getObject("util.execClient"); msg.app_key = "42d814c1-4daa-4643-88b2-f5dd3ec853f3";
var requrl = this.icUrl + "/deliverybillCtl/updateStatusByDeliverCode"; msg.jump_address = "myDeliver"
var params = {
"d": {
"deliverNumber": datajson.actionBody.orderNum,
"deliverStatus": "closed",
"statusReason": datajson.actionBody.refusalContent
}
}
var rtn = await rc.execPost3(params, requrl);
var j = JSON.parse(rtn.stdout);
if (j.status == 0) {
await this.cacheManager["TxCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180); //插入缓存
//给业务员发信息
var selUrl = this.icUrl + "/deliverybillCtl/findInfoByDeliverCode";
var selpar = {
"d": {
"deliverNumber": datajson.actionBody.orderNum
}
}
rtn = await rc.execPost3(selpar, selUrl);
var jj = JSON.parse(rtn.stdout);
console.log("jj-------------------------" + rtn.stdout);
if (jj.status == 0 && jj.data) {
var msg = {
"title": "你有关闭的交付单，请尽快处理",
"content": "交付单编号" + jj.data.delivery_code + ",产品类型是" + jj.data.product_name,
"sender": "管理员",
"sender_id": 0,
"msgType": "single",
"target": { "id": jj.data.delivery_man_id, "name": jj.data.delivery_man_name },
}
if (jj.data.product_code == "ICP" || jj.data.product_code == "EDI" || jj.data.product_code == "ICPANNUALREPORT" || jj.data.product_code == "EDIANNUALREPORT") {
msg.app_key = "5ae2da88-0ced-4b7a-98ea-60d5e1ff7e2e";
msg.jump_address = "deliveryAll"
} else {
msg.app_key = "42d814c1-4daa-4643-88b2-f5dd3ec853f3";
msg.jump_address = "myDeliver"
}
this.msgService.create(msg);
}
return {
"status": 1, //1代表成功，否则失败
"msg": "",
"data": "",
"requestId": ""
}
} else {
return j;
}
} }
} catch (error) { this.msgService.create(msg);
return system.getResultError(error); return {
"status": 1, //1代表成功，否则失败
"msg": "",
"data": "",
"requestId": ""
}
} else {
return j;
}
} }
}
} catch (error) {
console.log("error-------------------------------------" + error);
return system.getResultError(error);
} }
}
async ServiceCreate(datajson) { //获取融易算服务实例到队列 //关闭交付单处理
try { async orderClose(datajson) {
var rc = system.getObject("util.execClient"); console.log("put in queue", datajson);
var requrl = this.queueUrl; try {
var params = { var cachestr = sha235(JSON.stringify(datajson));
"actionType": "produceData", var cacheInfo = await this.cacheManager["TxCache"].getCache(cachestr);
"actionBody": { if (cacheInfo && cacheInfo != 'undefined') {
"pushUrl": this.bookUrl + "/deliverybillCtl", return {
"actionType": "insertInfo", "status": 1, //1代表成功，否则失败
"identifyCode": "book-manage", "msg": "已处理成功!",
"messageBody": datajson, "data": "",
"headData": { "requestId": ""
'Authorization': 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJvcnpaWmhXRXBKNVVFZzRZUU5uUmlyVEJXa1FQbnZ6UyIsImlhdCI6MTU5MjcwOTYzNn0.TWk_F6Tz3fRMqspoG24VSt5RiC4ldFembFYcLcAbowE', }
'XAPPKEY': '647a68c9-da01-40d3-9763-1ffa0f64cf3f' } else {
} var rc = system.getObject("util.execClient");
} var requrl = this.icUrl + "/deliverybillCtl/updateStatusByDeliverCode";
} var params = {
var rtn = await rc.execPost(params, requrl); "d": {
var j = JSON.parse(rtn.stdout); "deliverNumber": datajson.actionBody.orderNum,
if (j.status == 1) { "deliverStatus": "closed",
return { "statusReason": datajson.actionBody.refusalContent
"requestId": datajson.requestId, }
"success": true, }
"errorCode": 0, var rtn = await rc.execPost3(params, requrl);
"errorMsg": "ok", var j = JSON.parse(rtn.stdout);
"data": null if (j.status == 0) {
} await this.cacheManager["TxCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180); //插入缓存
} else {
return {
"requestId": datajson.requestId,
"success": false,
"errorCode": -1,
"errorMsg": rtn.stderr,
"data": null
}
}
} catch (error) { //给业务员发信息
return { var selUrl = this.icUrl + "/deliverybillCtl/findInfoByDeliverCode";
"requestId": datajson.requestId, var selpar = {
"success": false, "d": {
"errorCode": -1, "deliverNumber": datajson.actionBody.orderNum
"errorMsg": error, }
"data": null }
} rtn = await rc.execPost3(selpar, selUrl);
var jj = JSON.parse(rtn.stdout);
console.log("jj-------------------------" + rtn.stdout);
if (jj.status == 0 && jj.data) {
var msg = {
"title": "你有关闭的交付单，请尽快处理",
"content": "交付单编号" + jj.data.delivery_code + ",产品类型是" + jj.data.product_name,
"sender": "管理员",
"sender_id": 0,
"msgType": "single",
"target": { "id": jj.data.delivery_man_id, "name": jj.data.delivery_man_name },
} }
if (jj.data.product_code == "ICP" || jj.data.product_code == "EDI" || jj.data.product_code == "ICPANNUALREPORT" || jj.data.product_code == "EDIANNUALREPORT") {
msg.app_key = "5ae2da88-0ced-4b7a-98ea-60d5e1ff7e2e";
msg.jump_address = "deliveryAll"
} else {
msg.app_key = "42d814c1-4daa-4643-88b2-f5dd3ec853f3";
msg.jump_address = "myDeliver"
}
this.msgService.create(msg);
}
return {
"status": 1, //1代表成功，否则失败
"msg": "",
"data": "",
"requestId": ""
}
} else {
return j;
} }
// async createLeads(datajson) {//财税需求处理 }
// try { } catch (error) {
// var cachestr = sha235(JSON.stringify(datajson)); return system.getResultError(error);
// var cacheInfo = await this.cacheManager["TxCache"].getCache(cachestr); }
// if (cacheInfo && cacheInfo != 'undefined') {
// return {
// "status": 1, //1代表成功，否则失败
// "msg": "已处理成功!",
// "data": "",
// "requestId": ""
// }
// }
// else {
// var rc = system.getObject("util.execClient");
// var requrl = this.icUrl + "/bizoptCtl/insertInfo";//这个地方要改
// var params = {
// "businessMode": datajson.actionBody.NeedNum,//需求编号
// "servicerName": datajson.actionBody.ServicerName,//服务商编码
// "serviceCode": datajson.actionBody.RegionId,//服务地区编码
// "serviceName": datajson.actionBody.RegionName,//服务地区名字,需要转换
// //"contactsName": datajson.actionBody.ContactsName,
// "contactsPhone": datajson.actionBody.ContactsMobile,//联系人电话
// "businessType": datajson.actionBody.ConsultType,//需求类型
// "businessName": datajson.actionBody.ConsultTypeName,//需求名称
// "currentStatus": "beforeSubmission",
// "channelSource": "tencentCloud",//渠道
// "channelNumber": "tx"
// }
// } }
// }
// catch (error) {
// return system.getResultError(error);
// }
// } async ServiceCreate(datajson) { //获取融易算服务实例到队列
async LeadsCreate(datajson) { try {
try { var rc = system.getObject("util.execClient");
var rc = system.getObject("util.execClient"); var requrl = this.queueUrl;
var requrl = this.queueUrl //改队列 var params = {
var params = { "actionType": "produceData",
"actionType":   "produceData", "actionBody": {
"actionBody":  {           "pushUrl": this.bookUrl + "/deliverybillCtl/insertInfo",
"pushUrl":  this.icUrl  +  "/bizOptCtl", "actionType": "insertInfo",
"actionType":   "insertInfo", "identifyCode": "book-manage",
"identifyCode":   "book-manage", "messageBody": datajson,
"messageBody":  datajson, "headData": {
"headData": null // 'Authorization': 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTg0MzQ2ODcsImlzcyI6InJFRVN6TU5ZUlM2RnBWNnZlY09vdExPNWdPcUNXSmFQIiwiaWF0IjoxNTk4NDMxMDg3fQ.isQ40HqHHfJ-rTsUQOhRIdu4XCitZU-AfzeqSH4kPbQ',
}, 'XAPPKEY': 'f6b59b74-f943-4735-bb86-e05d6b7fd78e'
"requestId": datajson.requestId }
} }
var  rtn  =  await  rc.execPost(params,  requrl);       }
var  j  =  JSON.parse(rtn.stdout);       var rtn = await rc.execPost(params, requrl);
if  (j.status  ==  1)  {         var j = JSON.parse(rtn.stdout);
return  system.getResult("获取数据成功！");       if (j.status == 1) {
}       return {
else  {         "requestId": datajson.requestId,
return  system.getResultError("获取数据失败！");       "success": true,
} "errorCode": 0,
} catch (error) { "errorMsg": "ok",
return system.getResultError(error) "data": null
} }
} else {
return {
"requestId": datajson.requestId,
"success": false,
"errorCode": -1,
"errorMsg": rtn.stderr,
"data": null
}
}
} catch (error) {
return {
"requestId": datajson.requestId,
"success": false,
"errorCode": -1,
"errorMsg": error,
"data": null
}
} }
}
async ServiceUpdate(datajson) { //更新服务信息到队列
try {
var rc = system.getObject("util.execClient");
var requrl = this.queueUrl;
var params = {
"actionType": "produceData",
"actionBody": {
"pushUrl": this.bookUrl + "/deliverybillCtl/updateServer",
"actionType": "updateServer",
"identifyCode": "book-manage",
"messageBody": datajson,
"headData": {
'Authorization': 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTg0MzQ2ODcsImlzcyI6InJFRVN6TU5ZUlM2RnBWNnZlY09vdExPNWdPcUNXSmFQIiwiaWF0IjoxNTk4NDMxMDg3fQ.isQ40HqHHfJ-rTsUQOhRIdu4XCitZU-AfzeqSH4kPbQ',
'XAPPKEY': 'f6b59b74-f943-4735-bb86-e05d6b7fd78e'
}
}
}
var rtn = await rc.execPost(params, requrl);
var j = JSON.parse(rtn.stdout);
if (j.status == 1) {
return {
"requestId": datajson.requestId,
"success": true,
"errorCode": 0,
"errorMsg": "ok",
"data": null
}
} else {
return {
"requestId": datajson.requestId,
"success": false,
"errorCode": -1,
"errorMsg": rtn.stderr,
"data": null
}
}
} catch (error) {
return {
"requestId": datajson.requestId,
"success": false,
"errorCode": -1,
"errorMsg": error,
"data": null
}
}
<<<<<<< HEAD
// 服务状态变更通知 // 服务状态变更通知
async ServiceStatusNotify (datajson) { async ServiceStatusNotify (datajson) {
...@@ -693,6 +675,9 @@ class TxHandler { ...@@ -693,6 +675,9 @@ class TxHandler {
} }
} }
=======
}
>>>>>>> 6b34408d8443a74a5b97aaf995d52251e3124d04
} }
module.exports = new TxHandler(); module.exports = new TxHandler();
...@@ -701,10 +686,10 @@ module.exports = new TxHandler(); ...@@ -701,10 +686,10 @@ module.exports = new TxHandler();
// var task = new TxHandler(); // var task = new TxHandler();
// var obj = { // var obj = {
// "requestId": "825da0a74432-738f-4bed-b48d-d51aa808", // "requestId": "825da0a74432-738f-4bed-b48d-d51aa808",
// "bizId": "5892748825", // "bizId": "5892748825678",
// "contactsPhone": "18510669321", // "contactsPhone": "18510669321",
// "userId": "10973452443103825", // "userId": "10973452443103825",
// "orderId": "3411844566204567787", // "orderId": "341184456620456778900",
// "areatype": "city", // "areatype": "city",
// "area": "100010", // "area": "100010",
// "topOrgCode": "rong_yi_suan", // "topOrgCode": "rong_yi_suan",
...@@ -714,4 +699,5 @@ module.exports = new TxHandler(); ...@@ -714,4 +699,5 @@ module.exports = new TxHandler();
// console.log("ddddddddddddd"); // console.log("ddddddddddddd");
// console.log(JSON.stringify(d)); // console.log(JSON.stringify(d));
// console.log("dddddddddddddd"); // console.log("dddddddddddddd");
// })() // })()
\ No newline at end of file
center-manage/app/base/utils/execClient.js
...@@ -6,7 +6,8 @@ class ExecClient { ...@@ -6,7 +6,8 @@ class ExecClient {
constructor() { constructor() {
this.cmdPostPattern = "curl -k -H 'Content-type: application/json' -d '{data}' {url}"; this.cmdPostPattern = "curl -k -H 'Content-type: application/json' -d '{data}' {url}";
this.cmdGetPattern = "curl -G -X GET '{url}'"; this.cmdGetPattern = "curl -G -X GET '{url}'";
this.cmdPostPattern3 = "curl -k -H 'Content-type: application/json' -H 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJvcnpaWmhXRXBKNVVFZzRZUU5uUmlyVEJXa1FQbnZ6UyIsImlhdCI6MTU5MjcwOTYzNn0.TWk_F6Tz3fRMqspoG24VSt5RiC4ldFembFYcLcAbowE' -H 'XAPPKEY: 647a68c9-da01-40d3-9763-1ffa0f64cf3f' -d '{data}' {url}"; this.cmdPostPattern3 = "curl -k -H 'Content-type: application/json' -H 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTg0MzQ2ODcsImlzcyI6InJFRVN6TU5ZUlM2RnBWNnZlY09vdExPNWdPcUNXSmFQIiwiaWF0IjoxNTk4NDMxMDg3fQ.isQ40HqHHfJ-rTsUQOhRIdu4XCitZU-AfzeqSH4kPbQ' -H 'XAPPKEY: f6b59b74-f943-4735-bb86-e05d6b7fd78e' -d '{data}' {url}";
//this.cmdPostPattern3 = "curl -k -H 'Content-type: application/json' -H 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJvcnpaWmhXRXBKNVVFZzRZUU5uUmlyVEJXa1FQbnZ6UyIsImlhdCI6MTU5MjcwOTYzNn0.TWk_F6Tz3fRMqspoG24VSt5RiC4ldFembFYcLcAbowE' -H 'XAPPKEY: 647a68c9-da01-40d3-9763-1ffa0f64cf3f' -d '{data}' {url}";
} }
async exec(cmd) { async exec(cmd) {
......
center-manage/app/config/settings.js
...@@ -49,7 +49,7 @@ var settings = { ...@@ -49,7 +49,7 @@ var settings = {
}, },
bookUrl: function () { bookUrl: function () {
if (this.env == "localhost") { if (this.env == "localhost") {
return "http://book.com:8000"; return "http://192.168.1.19:8889";
} else { } else {
return "http://icdeliver-service"; return "http://icdeliver-service";
} }
...@@ -70,7 +70,7 @@ var settings = { ...@@ -70,7 +70,7 @@ var settings = {
}, },
bpushUrl: function () { bpushUrl: function () {
if (this.env == "localhost") { if (this.env == "localhost") {
return "http://127.0.0.1:4018/api/queueAction/producer/springBoard"; return "http://192.168.1.19:4018/api/queueAction/producer/springBoard";
} else { } else {
return "http://logs-sytxpublic-msgq-service/api/queueAction/producer/springBoard"; return "http://logs-sytxpublic-msgq-service/api/queueAction/producer/springBoard";
} }
......
center-manage/package-lock.json
...@@ -174,15 +174,14 @@ ...@@ -174,15 +174,14 @@
} }
}, },
"ajv": { "ajv": {
"version": "5.5.2", "version": "6.12.4",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.4.tgz?cache=0&sync_timestamp=1597480760804&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.4.tgz",
"integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "integrity": "sha1-BhT6zEUiEn+nE0Rca/0+vTduIjQ=",
"optional": true,
"requires": { "requires": {
"co": "^4.6.0", "fast-deep-equal": "^3.1.1",
"fast-deep-equal": "^1.0.0",
"fast-json-stable-stringify": "^2.0.0", "fast-json-stable-stringify": "^2.0.0",
"json-schema-traverse": "^0.3.0" "json-schema-traverse": "^0.4.1",
"uri-js": "^4.2.2"
} }
}, },
"ali-oss": { "ali-oss": {
...@@ -532,14 +531,23 @@ ...@@ -532,14 +531,23 @@
"asn1": { "asn1": {
"version": "0.2.3", "version": "0.2.3",
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
"integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=", "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
"optional": true },
"asn1.js": {
"version": "5.4.1",
"resolved": "https://registry.npm.taobao.org/asn1.js/download/asn1.js-5.4.1.tgz",
"integrity": "sha1-EamAuE67kXgc41sP3C7ilON4Pwc=",
"requires": {
"bn.js": "^4.0.0",
"inherits": "^2.0.1",
"minimalistic-assert": "^1.0.0",
"safer-buffer": "^2.1.0"
}
}, },
"assert-plus": { "assert-plus": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
"optional": true
}, },
"assign-symbols": { "assign-symbols": {
"version": "1.0.0", "version": "1.0.0",
...@@ -578,14 +586,12 @@ ...@@ -578,14 +586,12 @@
"asynckit": { "asynckit": {
"version": "0.4.0", "version": "0.4.0",
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
"optional": true
}, },
"aws-sign2": { "aws-sign2": {
"version": "0.7.0", "version": "0.7.0",
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", "resolved": "https://registry.npm.taobao.org/aws-sign2/download/aws-sign2-0.7.0.tgz",
"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
"optional": true
}, },
"aws4": { "aws4": {
"version": "1.7.0", "version": "1.7.0",
...@@ -1011,6 +1017,11 @@ ...@@ -1011,6 +1017,11 @@
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
"integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==" "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
}, },
"bn.js": {
"version": "4.11.9",
"resolved": "https://registry.npm.taobao.org/bn.js/download/bn.js-4.11.9.tgz",
"integrity": "sha1-JtVWgpRY+dHoH8SJUkk9C6NQeCg="
},
"body-parser": { "body-parser": {
"version": "1.18.3", "version": "1.18.3",
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
...@@ -1273,9 +1284,8 @@ ...@@ -1273,9 +1284,8 @@
}, },
"caseless": { "caseless": {
"version": "0.12.0", "version": "0.12.0",
"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "resolved": "https://registry.npm.taobao.org/caseless/download/caseless-0.12.0.tgz",
"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
"optional": true
}, },
"caw": { "caw": {
"version": "2.0.1", "version": "2.0.1",
...@@ -1529,7 +1539,6 @@ ...@@ -1529,7 +1539,6 @@
"version": "1.0.6", "version": "1.0.6",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
"integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
"optional": true,
"requires": { "requires": {
"delayed-stream": "~1.0.0" "delayed-stream": "~1.0.0"
} }
...@@ -1600,6 +1609,11 @@ ...@@ -1600,6 +1609,11 @@
"proto-list": "~1.2.1" "proto-list": "~1.2.1"
} }
}, },
"connect-history-api-fallback": {
"version": "1.6.0",
"resolved": "https://registry.npm.taobao.org/connect-history-api-fallback/download/connect-history-api-fallback-1.6.0.tgz",
"integrity": "sha1-izIIk1kwjRERFdgcrT/Oq4iPl7w="
},
"connect-redis": { "connect-redis": {
"version": "3.3.3", "version": "3.3.3",
"resolved": "https://registry.npmjs.org/connect-redis/-/connect-redis-3.3.3.tgz", "resolved": "https://registry.npmjs.org/connect-redis/-/connect-redis-3.3.3.tgz",
...@@ -1817,7 +1831,6 @@ ...@@ -1817,7 +1831,6 @@
"version": "1.14.1", "version": "1.14.1",
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
"optional": true,
"requires": { "requires": {
"assert-plus": "^1.0.0" "assert-plus": "^1.0.0"
} }
...@@ -2163,8 +2176,7 @@ ...@@ -2163,8 +2176,7 @@
"delayed-stream": { "delayed-stream": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
"optional": true
}, },
"denque": { "denque": {
"version": "1.2.3", "version": "1.2.3",
...@@ -3065,8 +3077,7 @@ ...@@ -3065,8 +3077,7 @@
"extsprintf": { "extsprintf": {
"version": "1.3.0", "version": "1.3.0",
"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
"optional": true
}, },
"fancy-log": { "fancy-log": {
"version": "1.3.2", "version": "1.3.2",
...@@ -3092,10 +3103,9 @@ ...@@ -3092,10 +3103,9 @@
} }
}, },
"fast-deep-equal": { "fast-deep-equal": {
"version": "1.1.0", "version": "3.1.3",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz?cache=0&sync_timestamp=1591599675178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-deep-equal%2Fdownload%2Ffast-deep-equal-3.1.3.tgz",
"integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", "integrity": "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU="
"optional": true
}, },
"fast-glob": { "fast-glob": {
"version": "3.1.0", "version": "3.1.0",
...@@ -3156,10 +3166,9 @@ ...@@ -3156,10 +3166,9 @@
} }
}, },
"fast-json-stable-stringify": { "fast-json-stable-stringify": {
"version": "2.0.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", "resolved": "https://registry.npm.taobao.org/fast-json-stable-stringify/download/fast-json-stable-stringify-2.1.0.tgz",
"integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", "integrity": "sha1-h0v2nG9ATCtdmcSBNBOZ/VWJJjM="
"optional": true
}, },
"fast-levenshtein": { "fast-levenshtein": {
"version": "2.0.6", "version": "2.0.6",
...@@ -3274,8 +3283,7 @@ ...@@ -3274,8 +3283,7 @@
"forever-agent": { "forever-agent": {
"version": "0.6.1", "version": "0.6.1",
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
"optional": true
}, },
"fork-stream": { "fork-stream": {
"version": "0.0.4", "version": "0.0.4",
...@@ -3287,7 +3295,6 @@ ...@@ -3287,7 +3295,6 @@
"version": "2.3.2", "version": "2.3.2",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
"integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
"optional": true,
"requires": { "requires": {
"asynckit": "^0.4.0", "asynckit": "^0.4.0",
"combined-stream": "1.0.6", "combined-stream": "1.0.6",
...@@ -3446,7 +3453,6 @@ ...@@ -3446,7 +3453,6 @@
"version": "0.1.7", "version": "0.1.7",
"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
"optional": true,
"requires": { "requires": {
"assert-plus": "^1.0.0" "assert-plus": "^1.0.0"
} }
...@@ -3876,17 +3882,15 @@ ...@@ -3876,17 +3882,15 @@
}, },
"har-schema": { "har-schema": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", "resolved": "https://registry.npm.taobao.org/har-schema/download/har-schema-2.0.0.tgz",
"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
"optional": true
}, },
"har-validator": { "har-validator": {
"version": "5.0.3", "version": "5.1.5",
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", "resolved": "https://registry.npm.taobao.org/har-validator/download/har-validator-5.1.5.tgz?cache=0&sync_timestamp=1596084327526&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhar-validator%2Fdownload%2Fhar-validator-5.1.5.tgz",
"integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "integrity": "sha1-HwgDufjLIMD6E4It8ezds2veHv0=",
"optional": true,
"requires": { "requires": {
"ajv": "^5.1.0", "ajv": "^6.12.3",
"har-schema": "^2.0.0" "har-schema": "^2.0.0"
} }
}, },
...@@ -4043,9 +4047,8 @@ ...@@ -4043,9 +4047,8 @@
}, },
"http-signature": { "http-signature": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "resolved": "https://registry.npm.taobao.org/http-signature/download/http-signature-1.2.0.tgz",
"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
"optional": true,
"requires": { "requires": {
"assert-plus": "^1.0.0", "assert-plus": "^1.0.0",
"jsprim": "^1.2.2", "jsprim": "^1.2.2",
...@@ -4582,8 +4585,7 @@ ...@@ -4582,8 +4585,7 @@
"is-typedarray": { "is-typedarray": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
"optional": true
}, },
"is-utf8": { "is-utf8": {
"version": "0.2.1", "version": "0.2.1",
...@@ -4721,20 +4723,17 @@ ...@@ -4721,20 +4723,17 @@
"json-schema": { "json-schema": {
"version": "0.2.3", "version": "0.2.3",
"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
"optional": true
}, },
"json-schema-traverse": { "json-schema-traverse": {
"version": "0.3.1", "version": "0.4.1",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz",
"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA="
"optional": true
}, },
"json-stringify-safe": { "json-stringify-safe": {
"version": "5.0.1", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
"optional": true
}, },
"jsonfile": { "jsonfile": {
"version": "4.0.0", "version": "4.0.0",
...@@ -4791,7 +4790,6 @@ ...@@ -4791,7 +4790,6 @@
"version": "1.4.1", "version": "1.4.1",
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
"optional": true,
"requires": { "requires": {
"assert-plus": "1.0.0", "assert-plus": "1.0.0",
"extsprintf": "1.3.0", "extsprintf": "1.3.0",
...@@ -5542,6 +5540,11 @@ ...@@ -5542,6 +5540,11 @@
"integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
"dev": true "dev": true
}, },
"minimalistic-assert": {
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/minimalistic-assert/download/minimalistic-assert-1.0.1.tgz",
"integrity": "sha1-LhlN4ERibUoQ5/f7wAznPoPk1cc="
},
"minimist": { "minimist": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
...@@ -5563,9 +5566,9 @@ ...@@ -5563,9 +5566,9 @@
} }
}, },
"moment": { "moment": {
"version": "2.22.1", "version": "2.27.0",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.22.1.tgz", "resolved": "https://registry.npm.taobao.org/moment/download/moment-2.27.0.tgz?cache=0&sync_timestamp=1592516084857&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmoment%2Fdownload%2Fmoment-2.27.0.tgz",
"integrity": "sha512-shJkRTSebXvsVqk56I+lkb2latjBs8I+pc2TzWc545y2iFnSjm7Wg0QMh+ZWcdSLQyGEau5jI8ocnmkyTgr9YQ==" "integrity": "sha1-i/9OPiaiNiIN/j423nVrbrqgEF0="
}, },
"moment-timezone": { "moment-timezone": {
"version": "0.5.17", "version": "0.5.17",
...@@ -6012,6 +6015,14 @@ ...@@ -6012,6 +6015,14 @@
"resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz", "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz",
"integrity": "sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw==" "integrity": "sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw=="
}, },
"opentype.js": {
"version": "0.7.3",
"resolved": "https://registry.npm.taobao.org/opentype.js/download/opentype.js-0.7.3.tgz",
"integrity": "sha1-QPuM4Yv9YOdESO/f5EKDQJg5eqs=",
"requires": {
"tiny-inflate": "^1.0.2"
}
},
"optionator": { "optionator": {
"version": "0.8.2", "version": "0.8.2",
"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
...@@ -6318,6 +6329,14 @@ ...@@ -6318,6 +6329,14 @@
"resolved": "https://registry.npmjs.org/pdfcrowd/-/pdfcrowd-4.3.1.tgz", "resolved": "https://registry.npmjs.org/pdfcrowd/-/pdfcrowd-4.3.1.tgz",
"integrity": "sha1-26C9qLJ3GJa8KUu4bD/CZGssULw=" "integrity": "sha1-26C9qLJ3GJa8KUu4bD/CZGssULw="
}, },
"pem-jwk": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/pem-jwk/download/pem-jwk-2.0.0.tgz",
"integrity": "sha1-HFuyZGEvw5E0CQf1wd5gwG0i8IU=",
"requires": {
"asn1.js": "^5.0.1"
}
},
"pend": { "pend": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
...@@ -6326,9 +6345,8 @@ ...@@ -6326,9 +6345,8 @@
}, },
"performance-now": { "performance-now": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "resolved": "https://registry.npm.taobao.org/performance-now/download/performance-now-2.1.0.tgz",
"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
"optional": true
}, },
"picomatch": { "picomatch": {
"version": "2.1.1", "version": "2.1.1",
...@@ -6525,6 +6543,11 @@ ...@@ -6525,6 +6543,11 @@
"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
}, },
"psl": {
"version": "1.8.0",
"resolved": "https://registry.npm.taobao.org/psl/download/psl-1.8.0.tgz",
"integrity": "sha1-kyb4vPsBOtzABf3/BWrM4CDlHCQ="
},
"pump": { "pump": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
...@@ -6719,31 +6742,79 @@ ...@@ -6719,31 +6742,79 @@
"dev": true "dev": true
}, },
"request": { "request": {
"version": "2.87.0", "version": "2.88.2",
"resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", "resolved": "https://registry.npm.taobao.org/request/download/request-2.88.2.tgz",
"integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", "integrity": "sha1-1zyRhzHLWofaBH4gcjQUb2ZNErM=",
"optional": true,
"requires": { "requires": {
"aws-sign2": "~0.7.0", "aws-sign2": "~0.7.0",
"aws4": "^1.6.0", "aws4": "^1.8.0",
"caseless": "~0.12.0", "caseless": "~0.12.0",
"combined-stream": "~1.0.5", "combined-stream": "~1.0.6",
"extend": "~3.0.1", "extend": "~3.0.2",
"forever-agent": "~0.6.1", "forever-agent": "~0.6.1",
"form-data": "~2.3.1", "form-data": "~2.3.2",
"har-validator": "~5.0.3", "har-validator": "~5.1.3",
"http-signature": "~1.2.0", "http-signature": "~1.2.0",
"is-typedarray": "~1.0.0", "is-typedarray": "~1.0.0",
"isstream": "~0.1.2", "isstream": "~0.1.2",
"json-stringify-safe": "~5.0.1", "json-stringify-safe": "~5.0.1",
"mime-types": "~2.1.17", "mime-types": "~2.1.19",
"oauth-sign": "~0.8.2", "oauth-sign": "~0.9.0",
"performance-now": "^2.1.0", "performance-now": "^2.1.0",
"qs": "~6.5.1", "qs": "~6.5.2",
"safe-buffer": "^5.1.1", "safe-buffer": "^5.1.2",
"tough-cookie": "~2.3.3", "tough-cookie": "~2.5.0",
"tunnel-agent": "^0.6.0", "tunnel-agent": "^0.6.0",
"uuid": "^3.1.0" "uuid": "^3.3.2"
},
"dependencies": {
"aws4": {
"version": "1.10.1",
"resolved": "https://registry.npm.taobao.org/aws4/download/aws4-1.10.1.tgz?cache=0&sync_timestamp=1597236991117&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faws4%2Fdownload%2Faws4-1.10.1.tgz",
"integrity": "sha1-4eguTz6Zniz9YbFhKA0WoRH4ZCg="
},
"extend": {
"version": "3.0.2",
"resolved": "https://registry.npm.taobao.org/extend/download/extend-3.0.2.tgz",
"integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo="
},
"mime-db": {
"version": "1.44.0",
"resolved": "https://registry.npm.taobao.org/mime-db/download/mime-db-1.44.0.tgz",
"integrity": "sha1-+hHF6wrKEzS0Izy01S8QxaYnL5I="
},
"mime-types": {
"version": "2.1.27",
"resolved": "https://registry.npm.taobao.org/mime-types/download/mime-types-2.1.27.tgz",
"integrity": "sha1-R5SfmOJ56lMRn1ci4PNOUpvsAJ8=",
"requires": {
"mime-db": "1.44.0"
}
},
"oauth-sign": {
"version": "0.9.0",
"resolved": "https://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.9.0.tgz",
"integrity": "sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU="
},
"punycode": {
"version": "2.1.1",
"resolved": "https://registry.npm.taobao.org/punycode/download/punycode-2.1.1.tgz",
"integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew="
},
"tough-cookie": {
"version": "2.5.0",
"resolved": "https://registry.npm.taobao.org/tough-cookie/download/tough-cookie-2.5.0.tgz?cache=0&sync_timestamp=1584647110516&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftough-cookie%2Fdownload%2Ftough-cookie-2.5.0.tgz",
"integrity": "sha1-zZ+yoKodWhK0c72fuW+j3P9lreI=",
"requires": {
"psl": "^1.1.28",
"punycode": "^2.1.1"
}
},
"uuid": {
"version": "3.4.0",
"resolved": "https://registry.npm.taobao.org/uuid/download/uuid-3.4.0.tgz?cache=0&sync_timestamp=1595884879134&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuuid%2Fdownload%2Fuuid-3.4.0.tgz",
"integrity": "sha1-sj5DWK+oogL+ehAK8fX4g/AgB+4="
}
} }
}, },
"requestretry": { "requestretry": {
...@@ -7490,7 +7561,6 @@ ...@@ -7490,7 +7561,6 @@
"version": "1.14.1", "version": "1.14.1",
"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz",
"integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=",
"optional": true,
"requires": { "requires": {
"asn1": "~0.2.3", "asn1": "~0.2.3",
"assert-plus": "^1.0.0", "assert-plus": "^1.0.0",
...@@ -7666,6 +7736,14 @@ ...@@ -7666,6 +7736,14 @@
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
}, },
"svg-captcha": {
"version": "1.4.0",
"resolved": "https://registry.npm.taobao.org/svg-captcha/download/svg-captcha-1.4.0.tgz",
"integrity": "sha1-MurTxkY5NsIYuzvJ7QT+pO7/5JI=",
"requires": {
"opentype.js": "^0.7.3"
}
},
"svgo": { "svgo": {
"version": "1.3.2", "version": "1.3.2",
"resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz", "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
...@@ -7889,6 +7967,11 @@ ...@@ -7889,6 +7967,11 @@
"integrity": "sha1-SQLOBAvRPYRcj1myfp1ZutbzmSk=", "integrity": "sha1-SQLOBAvRPYRcj1myfp1ZutbzmSk=",
"optional": true "optional": true
}, },
"tiny-inflate": {
"version": "1.0.3",
"resolved": "https://registry.npm.taobao.org/tiny-inflate/download/tiny-inflate-1.0.3.tgz",
"integrity": "sha1-EicVSUkToYBRZqr3yTRnkz7qJsQ="
},
"tmp": { "tmp": {
"version": "0.1.0", "version": "0.1.0",
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz",
...@@ -8150,6 +8233,21 @@ ...@@ -8150,6 +8233,21 @@
} }
} }
}, },
"uri-js": {
"version": "4.2.2",
"resolved": "https://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz",
"integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
"requires": {
"punycode": "^2.1.0"
},
"dependencies": {
"punycode": {
"version": "2.1.1",
"resolved": "https://registry.npm.taobao.org/punycode/download/punycode-2.1.1.tgz",
"integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew="
}
}
},
"url-parse-lax": { "url-parse-lax": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
...@@ -8245,7 +8343,6 @@ ...@@ -8245,7 +8343,6 @@
"version": "1.10.0", "version": "1.10.0",
"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
"optional": true,
"requires": { "requires": {
"assert-plus": "^1.0.0", "assert-plus": "^1.0.0",
"core-util-is": "1.0.2", "core-util-is": "1.0.2",
......
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