Skip to content

Z
zhichan
Commit a69db0d0 by Sxy
Options

fix: 接入入口优化

parent 249f3e8b
Showing with 76 additions and 40 deletions
center-manage/app/base/service/impl/common/channelhandlers/aliCloud.js
...@@ -357,7 +357,7 @@ class AliHandler { ...@@ -357,7 +357,7 @@ class AliHandler {
var rtn = await rc.execPost3({ "d": obj }, requrl); var rtn = await rc.execPost3({ "d": obj }, requrl);
console.log("pushOrderDelivery插入数据成功---------------------------------" + rtn.stdout); console.log("pushOrderDelivery插入数据成功---------------------------------" + rtn.stdout);
if (rtn.stdout.status == 0) { if (rtn.stdout.status == 0) {
await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180); await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180000);
rtn.stdout.status = 1; rtn.stdout.status = 1;
} }
return rtn.stdout return rtn.stdout
...@@ -409,52 +409,18 @@ class AliHandler { ...@@ -409,52 +409,18 @@ class AliHandler {
var rtn = await rc.execPost3(params, requrl); var rtn = await rc.execPost3(params, requrl);
var j = JSON.parse(rtn.stdout); var j = JSON.parse(rtn.stdout);
if (j.status == 0) { if (j.status == 0) {
await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180);//插入缓存 await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180000);//插入缓存
//给业务员发信息
var selUrl = this.icUrl + "/deliverybillCtl/findInfoByDeliverCode";
var selpar = {
"d": {
"deliverNumber": datajson.actionBody.orderNo
}
}
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": "你有" + title + "的交付单，请尽快处理",
"content": "交付单编号" + jj.data.delivery_code + ",产品类型是" + jj.data.product_name,
"sender": "管理员",
"sender_id": 0,
"msgType": "single",
"target": { "id": jj.data.salesman_id, "name": jj.data.salesman_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 { return {
"status": 1, //1代表成功，否则失败 "status": 1, //1代表成功，否则失败
"msg": "", "msg": "",
"data": "", "data": "",
"requestId": "" "requestId": ""
} }
} else {
}
else {
return j; return j;
} }
} }
} } catch (error) {
catch (error) {
return system.getResultError(error); return system.getResultError(error);
} }
} }
......
center-manage/app/base/service/impl/common/channelhandlers/baidu.js
...@@ -79,7 +79,6 @@ class BaiduHandler { ...@@ -79,7 +79,6 @@ class BaiduHandler {
} }
async updateChanceStatus(datajson) { async updateChanceStatus(datajson) {
console.log("put in queue [updateChanceStatus]" + JSON.stringify(datajson) + "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD");
try { try {
var cachestr = sha235(JSON.stringify(datajson)); var cachestr = sha235(JSON.stringify(datajson));
var cacheInfo = await this.cacheManager["AliCache"].getCache(cachestr); var cacheInfo = await this.cacheManager["AliCache"].getCache(cachestr);
...@@ -199,7 +198,7 @@ class BaiduHandler { ...@@ -199,7 +198,7 @@ class BaiduHandler {
var rtn = await rc.execPost3({ "d": obj }, requrl); var rtn = await rc.execPost3({ "d": obj }, requrl);
console.log("pushOrderDelivery插入数据成功---------------------------------" + rtn.stdout); console.log("pushOrderDelivery插入数据成功---------------------------------" + rtn.stdout);
if (rtn.stdout.status == 0) { if (rtn.stdout.status == 0) {
await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180); await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180000);
rtn.stdout.status = 1; rtn.stdout.status = 1;
} }
return rtn.stdout return rtn.stdout
...@@ -209,6 +208,48 @@ class BaiduHandler { ...@@ -209,6 +208,48 @@ class BaiduHandler {
} }
} }
//客户状态处理
async deliveryNotify(datajson) {
try {
var cachestr = sha235(JSON.stringify(datajson));
var cacheInfo = await this.cacheManager["AliCache"].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/updateFileAndStatusByDelivertCode";
var params = {
"d": {
"deliverNumber": datajson.actionBody.orderNo,
}
}
if (datajson.actionBody.needsolution.status == "CLOSE" || datajson.actionBody.needsolution.status == "ABC_CLOSE_PRODUCE") {//方案关闭
params.d.deliverStatus = "closed";
} else {
throw new Error(`needsolution.status 状态错误`);
}
var rtn = await rc.execPost3(params, requrl);
var j = JSON.parse(rtn.stdout);
if (j.status == 0) {
await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180000);//插入缓存
j.status = 1;
}
return j;
}
}
catch (error) {
return system.getResultError(error);
}
}
async actionBodyHandler(actionBody) { async actionBodyHandler(actionBody) {
let data = actionBody; let data = actionBody;
let obj = {}; let obj = {};
......
center-manage/app/base/service/impl/common/channelhandlers/pannong.js
...@@ -36,6 +36,35 @@ class PannongHandler { ...@@ -36,6 +36,35 @@ class PannongHandler {
return system.getResultError(error); return system.getResultError(error);
} }
} }
async notifyService(datajson) {
try {
let cachestr = sha235(JSON.stringify(datajson));
let cacheInfo = await this.cacheManager["AliCache"].getCache(cachestr);
if (cacheInfo && cacheInfo != 'undefined') {
return {
"status": 1, //1代表成功，否则失败
"msg": "已处理成功!",
"data": "",
"requestId": ""
}
} else {
let requrl = `${this.icpUrl}/web/agriculture/servicebillCtl/update`;
let { actionBody } = datajson;
let rtn = await rc.execPost3(actionBody, requrl);
let j = JSON.parse(rtn.stdout);
if (j.status == 0) {
j.status = 1;
await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180000);//插入redis缓存
}
return j;
}
} catch (error) {
console.log(error);
return system.getResultError(error);
}
}
} }
......
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