Commit 67c0f229 by 王勇飞

pp

parent 635bd810
...@@ -725,7 +725,7 @@ module.exports = UserService; ...@@ -725,7 +725,7 @@ module.exports = UserService;
// async function start() { // async function start() {
// try { // try {
// // let result = await cacheManager["LoopDistributionUserCache"].cache("wyf", JSON.stringify({name: "test2", idx: 2})); // // let result = await cacheManager["LoopDistributionUserCache"].cache("wyf", JSON.stringify({name: "test2", idx: 2}));
// let result = await cacheManager["LoopDistributionUserCache"].getCache("LoopDistributionUserCache"); // let result = await cacheManager["AliCache"].getCache("8a6ce4069a8f104c70405fd1ae5be5023f62d065");
// // let result = await cacheManager["LoopDistributionUserCache"].invalidate("LoopDistributionUserCache"); // // let result = await cacheManager["LoopDistributionUserCache"].invalidate("LoopDistributionUserCache");
// console.log('----=-=-=-:' + JSON.stringify(result)); // console.log('----=-=-=-:' + JSON.stringify(result));
......
...@@ -64,7 +64,7 @@ class AliHandler { ...@@ -64,7 +64,7 @@ class AliHandler {
var j = JSON.parse(rtn.stdout); var j = JSON.parse(rtn.stdout);
console.log(JSON.stringify(j), "RRRRRRRRRRRRRRR"); console.log(JSON.stringify(j), "RRRRRRRRRRRRRRR");
if (j.status == 1) { if (j.status == 1) {
await this.cacheManager["AliCache"].cache(cachestr, null, 600000);//插入redis缓存 await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({cachestr: cachestr}), 180000);//插入redis缓存
//给业务员发信息 //给业务员发信息
var msg = { var msg = {
"title": "你有新的商机,请尽快处理", "title": "你有新的商机,请尽快处理",
...@@ -123,7 +123,7 @@ class AliHandler { ...@@ -123,7 +123,7 @@ 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, null, 600000);//插入缓存 await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({cachestr: cachestr}), 180000);//插入缓存
//给业务员发信息 //给业务员发信息
var selUrl = this.icUrl + "/schemeCtl/findInfoByDemandCode"; var selUrl = this.icUrl + "/schemeCtl/findInfoByDemandCode";
...@@ -179,16 +179,10 @@ class AliHandler { ...@@ -179,16 +179,10 @@ class AliHandler {
console.log("put in queue-----------------------------------------------------------------------------------------------------", datajson); console.log("put in queue-----------------------------------------------------------------------------------------------------", datajson);
try { try {
console.log("交付单数据:" + JSON.stringify(datajson)); console.log("交付单数据:" + JSON.stringify(datajson));
// return {
// "status": 1, //1代表成功,否则失败
// "msg": "已处理成功!",
// "data": "",
// "requestId": ""
// }
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);
if (cacheInfo && cacheInfo != 'undefined') { if (cacheInfo && cacheInfo != 'undefined') {
console.log("pushOrderDelivery 已缓存:" + cachestr + ", 缓存内容: " + JSON.stringify(cacheInfo));
return { return {
"status": 1, //1代表成功,否则失败 "status": 1, //1代表成功,否则失败
"msg": "已处理成功!", "msg": "已处理成功!",
...@@ -196,75 +190,75 @@ class AliHandler { ...@@ -196,75 +190,75 @@ class AliHandler {
"requestId": "" "requestId": ""
} }
} }
else { // else {
var rc = system.getObject("util.execClient"); // var rc = system.getObject("util.execClient");
var requrl = this.icUrl + "/deliverybillCtl/findInfoByDeliverCode"; // var requrl = this.icUrl + "/deliverybillCtl/findInfoByDeliverCode";
var delInfo = await rc.execPost3({ "d": { "deliverNumber": datajson.actionBody.orderNo } }, requrl); // var delInfo = await rc.execPost3({ "d": { "deliverNumber": datajson.actionBody.orderNo } }, requrl);
console.log("jdelInfo---------------------------------------------" + delInfo.stdout); // console.log("jdelInfo---------------------------------------------" + delInfo.stdout);
var jdelInfo = JSON.parse(delInfo.stdout); // var jdelInfo = JSON.parse(delInfo.stdout);
if (jdelInfo.status == 0) { // if (jdelInfo.status == 0) {
return { // return {
"status": 1, //1代表成功,否则失败 // "status": 1, //1代表成功,否则失败
"msg": "数据已存在", // "msg": "数据已存在",
"data": "", // "data": "",
"requestId": "" // "requestId": ""
} // }
} // }
else { // else {}
let obj = await this.actionBodyHandler(datajson.actionBody); // }
//渠道名称和渠道编码 let rc = system.getObject("util.execClient");
let obj = await this.actionBodyHandler(datajson.actionBody);
//渠道名称和渠道编码
obj.channelSource = channelobj.name; obj.channelSource = channelobj.name;
obj.channelNumber = channelobj.code; obj.channelNumber = channelobj.code;
//分配业务员 //分配业务员
if (datajson.actionBody.needsolution.salesmanInfo.salesmanChannelId) { if (datajson.actionBody.needsolution.salesmanInfo.salesmanChannelId) {
//去数据库查询该业务员信息 //去数据库查询该业务员信息
try { try {
let resInfo = await this.userService.getSalesmanInfo(datajson.actionBody.needsolution.salesmanInfo.salesmanChannelId); let resInfo = await this.userService.getSalesmanInfo(datajson.actionBody.needsolution.salesmanInfo.salesmanChannelId);
obj.salesmanOpcode = resInfo.opath; obj.salesmanOpcode = resInfo.opath;
obj.salesmanName = resInfo.nickName; obj.salesmanName = resInfo.nickName;
obj.servicerCode = resInfo.company_id; obj.servicerCode = resInfo.company_id;
} catch (error) { } catch (error) {
console.log("salesmanChannelId: " + datajson.actionBody.needsolution.salesmanInfo.salesmanChannelId + "获取业务员opcode失败:" + error) console.log("salesmanChannelId: " + datajson.actionBody.needsolution.salesmanInfo.salesmanChannelId + "获取业务员opcode失败:" + error)
} }
} }
//分配交付员 //分配交付员
var ConsultTypeName = ""; var ConsultTypeName = "";
if (obj.businessName && obj.businessName != 'undefined') { if (obj.businessName && obj.businessName != 'undefined') {
console.log("productTypeName-----------------------------" + obj.businessName); console.log("productTypeName-----------------------------" + obj.businessName);
ConsultTypeName = obj.businessName; ConsultTypeName = obj.businessName;
} }
try { try {
var deliveryInfo = await this.userService.getBizUserForAliDelivery(obj.baseInfo.contactsName, obj.servicerName, ConsultTypeName, obj.skuCode, obj.serviceName); var deliveryInfo = await this.userService.getBizUserForAliDelivery(obj.baseInfo.contactsName, obj.servicerName, ConsultTypeName, obj.skuCode, obj.serviceName);
} catch (error) { } catch (error) {
console.log("分配交付元失败."); console.log("分配交付元失败.");
} }
requrl = this.icUrl + "/deliverybillCtl/dealAliDeliveryInfo"; let requrl = this.icUrl + "/deliverybillCtl/dealAliDeliveryInfo";
// var bizurl = this.icUrl + "/bizoptCtl/updateStatusByDemandCode"; // var bizurl = this.icUrl + "/bizoptCtl/updateStatusByDemandCode";
if (deliveryInfo && deliveryInfo != 'undefined') { if (deliveryInfo && deliveryInfo != 'undefined') {
obj.clerkOpcode = deliveryInfo.opath;//交付员opcode obj.clerkOpcode = deliveryInfo.opath;//交付员opcode
obj.clerkId = deliveryInfo.userId;//交付员id obj.clerkId = deliveryInfo.userId;//交付员id
obj.costPrice = deliveryInfo.cost;//成本 obj.costPrice = deliveryInfo.cost;//成本
obj.clerkName = deliveryInfo.userName;//交付员名称 obj.clerkName = deliveryInfo.userName;//交付员名称
// obj.clerkPhone = deliveryInfo.mobile;//交付人员电话 // obj.clerkPhone = deliveryInfo.mobile;//交付人员电话
// obj.servicerCode = deliveryInfo.compId; // obj.servicerCode = deliveryInfo.compId;
} }
console.log("推送数据oj: " + JSON.stringify(obj)); console.log("推送数据oj: " + JSON.stringify(obj));
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);
let cacheDeliveryInfo = await this.cacheManager["AliCache"].cache(cachestr, null, 1200000); let cacheDeliveryInfo = await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({cachestr: cachestr}), 180);
console.log("交付单缓存信息: " + JSON.stringify(cacheDeliveryInfo)); console.log("交付单缓存信息: " + JSON.stringify(cacheDeliveryInfo));
return { return {
"status": 1, //1代表成功,否则失败 "status": 1, //1代表成功,否则失败
"msg": "", "msg": "",
"data": "", "data": "",
"requestId": "" "requestId": ""
}
}
} }
} }
catch (error) { catch (error) {
...@@ -310,7 +304,7 @@ class AliHandler { ...@@ -310,7 +304,7 @@ 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, null, 600000);//插入缓存 await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({cachestr: cachestr}), 180);//插入缓存
//给业务员发信息 //给业务员发信息
var selUrl = this.icUrl + "/deliverybillCtl/findInfoByDeliverCode"; var selUrl = this.icUrl + "/deliverybillCtl/findInfoByDeliverCode";
var selpar = { var selpar = {
...@@ -444,7 +438,7 @@ class AliHandler { ...@@ -444,7 +438,7 @@ class AliHandler {
obj.baseInfo.contactsPhone = data.needsolution.customerInfo.publishMobile; obj.baseInfo.contactsPhone = data.needsolution.customerInfo.publishMobile;
} }
if (data.needsolution.customerRemark) {//备注信息 if (data.needsolution.customerRemark) {//备注信息
obj.baseInfo.memoinfo = data.needsolution.customerRemark; obj.baseInfo.memoInfo = data.needsolution.customerRemark;
} }
} }
if (data.needsolution.customerMaterial) {//客户上传所有材料 if (data.needsolution.customerMaterial) {//客户上传所有材料
......
...@@ -67,7 +67,7 @@ class TxHandler { ...@@ -67,7 +67,7 @@ class TxHandler {
var j = JSON.parse(rtn.stdout); var j = JSON.parse(rtn.stdout);
console.log(JSON.stringify(j), "RRRRRRRRRRRRRRR"); console.log(JSON.stringify(j), "RRRRRRRRRRRRRRR");
if (j.status == 1) { if (j.status == 1) {
await this.cacheManager["TxCache"].cache(cachestr, null, 1200000);//插入redis缓存 await this.cacheManager["TxCache"].cache(cachestr, JSON.stringify({cachestr: cachestr}), 180);//插入redis缓存
//给业务员发信息 //给业务员发信息
var msg = { var msg = {
"title": "你有新的商机,请尽快处理", "title": "你有新的商机,请尽快处理",
...@@ -126,7 +126,7 @@ class TxHandler { ...@@ -126,7 +126,7 @@ class TxHandler {
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["TxCache"].cache(cachestr, null, 1200000);//插入缓存 await this.cacheManager["TxCache"].cache(cachestr, JSON.stringify({cachestr: cachestr}), 180);//插入缓存
//给业务员发信息 //给业务员发信息
var selUrl = this.icUrl + "/schemeCtl/findInfoByDemandCode"; var selUrl = this.icUrl + "/schemeCtl/findInfoByDemandCode";
...@@ -406,7 +406,7 @@ class TxHandler { ...@@ -406,7 +406,7 @@ class TxHandler {
var j1 = JSON.parse(rtn.stdout); var j1 = JSON.parse(rtn.stdout);
console.log("j1---------------------------------" + rtn.stdout); console.log("j1---------------------------------" + rtn.stdout);
if (j.status == 0 && j1.status == 0) { if (j.status == 0 && j1.status == 0) {
await this.cacheManager["TxCache"].cache(cachestr, null, 1200000); await this.cacheManager["TxCache"].cache(cachestr, JSON.stringify({cachestr: cachestr}), 180);
//给业务员发信息 //给业务员发信息
var msg = { var msg = {
"title": "你有新的交付单,请尽快处理", "title": "你有新的交付单,请尽快处理",
...@@ -471,7 +471,7 @@ class TxHandler { ...@@ -471,7 +471,7 @@ class TxHandler {
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["TxCache"].cache(cachestr, null, 1200000);//插入缓存 await this.cacheManager["TxCache"].cache(cachestr, JSON.stringify({cachestr: cachestr}), 180);//插入缓存
//给业务员发信息 //给业务员发信息
var selUrl = this.icUrl + "/deliverybillCtl/findInfoByDeliverCode"; var selUrl = this.icUrl + "/deliverybillCtl/findInfoByDeliverCode";
......
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