Skip to content

Z
zhichan
Commit 715e0b82 by 蒋勇
Options

Merge branch 'center-manage' of gitlab.gongsibao.com:jiangyong/zhichan into center-manage

parents 964222c4 013932c3
Showing with 43 additions and 31 deletions
center-manage/app/base/controller/impl/msg/msgCtl.js
...@@ -31,7 +31,7 @@ class MsgCtl extends CtlBase { ...@@ -31,7 +31,7 @@ class MsgCtl extends CtlBase {
if (!pobj.content) { if (!pobj.content) {
return system.getResult(null, "content can not be empty，100290"); return system.getResult(null, "content can not be empty，100290");
} }
if (!pobj.sender || !pobj.sender_id) { if (!pobj.sender || (pobj.sender_id !== 0 && !pobj.sender_id)) {
return system.getResult(null, "发送者信息 can not be empty，100290"); return system.getResult(null, "发送者信息 can not be empty，100290");
} }
if (pobj.jump_address && !pobj.app_key) { if (pobj.jump_address && !pobj.app_key) {
......
center-manage/app/base/service/impl/common/channelhandlers/tx.js
...@@ -70,6 +70,7 @@ class TxHandler { ...@@ -70,6 +70,7 @@ class TxHandler {
"title": "你有新的商机，请尽快处理", "title": "你有新的商机，请尽快处理",
"content": "商机编号" + params.businessMode + ",商机类型是" + params.businessName + ",服务地区是" + params.serviceName, "content": "商机编号" + params.businessMode + ",商机类型是" + params.businessName + ",服务地区是" + params.serviceName,
"sender": "管理员", "sender": "管理员",
"sender_id":0,
"msgType": "single", "msgType": "single",
"target": { "id": params.salesmanId, "name": params.clerkName }, "target": { "id": params.salesmanId, "name": params.clerkName },
} }
...@@ -133,22 +134,27 @@ class TxHandler { ...@@ -133,22 +134,27 @@ class TxHandler {
} }
rtn = await rc.execPost3(selpar, selUrl); rtn = await rc.execPost3(selpar, selUrl);
var jj = JSON.parse(rtn.stdout); var jj = JSON.parse(rtn.stdout);
var msg = { console.log("jj------------------------------" + rtn.stdout);
"title": "你有退回的商机，请尽快处理", if (jj.status == 0 && jj.data){
"content": "商机编号" + jj.businessMode + ",商机类型是" + jj.businessName, var msg = {
"sender": "管理员", "title": "你有退回的商机，请尽快处理",
"msgType": "single", "content": "商机编号" + jj.data.businessMode + ",商机类型是" + jj.data.businessName,
"target": { "id": jj.clerkId, "name": jj.clerkName }, "sender": "管理员",
} "sender_id":0,
if (jj.businessType == "ICP" || params.businessType == "EDI" || params.businessType == "ICPANNUALREPORT" || params.businessType == "EDIANNUALREPORT") { "msgType": "single",
msg.app_key = "5ae2da88-0ced-4b7a-98ea-60d5e1ff7e2e"; "target": { "id": jj.data.clerkId, "name": jj.data.clerkName },
msg.jump_address = "allDispose" }
} if (jj.data.businessType == "ICP" || jj.data.businessType == "EDI" || jj.data.businessType == "ICPANNUALREPORT" || jj.data.businessType == "EDIANNUALREPORT") {
else { msg.app_key = "5ae2da88-0ced-4b7a-98ea-60d5e1ff7e2e";
msg.app_key = "42d814c1-4daa-4643-88b2-f5dd3ec853f3"; msg.jump_address = "allDispose"
msg.jump_address = "myChance" }
else {
msg.app_key = "42d814c1-4daa-4643-88b2-f5dd3ec853f3";
msg.jump_address = "myChance"
}
var msgInfo = await this.msgService.create(msg);
console.log("msgInfo -----------------------------" + msgInfo);
} }
await this.msgService.create(msg);
return { return {
"status": 1, //1代表成功，否则失败 "status": 1, //1代表成功，否则失败
...@@ -392,6 +398,7 @@ class TxHandler { ...@@ -392,6 +398,7 @@ class TxHandler {
"title": "你有新的交付单，请尽快处理", "title": "你有新的交付单，请尽快处理",
"content": "交付单编号" + params.deliverNumber + ",产品类型是" + params.businessName + ",服务地区是" + params.serviceName, "content": "交付单编号" + params.deliverNumber + ",产品类型是" + params.businessName + ",服务地区是" + params.serviceName,
"sender": "管理员", "sender": "管理员",
"sender_id":0,
"msgType": "single", "msgType": "single",
"target": { "id": params.clerkId, "name": params.clerkName }, "target": { "id": params.clerkId, "name": params.clerkName },
} }
...@@ -461,22 +468,27 @@ class TxHandler { ...@@ -461,22 +468,27 @@ class TxHandler {
} }
rtn = await rc.execPost3(selpar, selUrl); rtn = await rc.execPost3(selpar, selUrl);
var jj = JSON.parse(rtn.stdout); var jj = JSON.parse(rtn.stdout);
var msg = { console.log("jj-------------------------" + rtn.stdout);
"title": "你有关闭的交付单，请尽快处理", if (jj.status ==0 && jj.data){
"content": "交付单编号" + jj.delivery_code + ",产品类型是" + jj.product_name, var msg = {
"sender": "管理员", "title": "你有关闭的交付单，请尽快处理",
"msgType": "single", "content": "交付单编号" + jj.data.delivery_code + ",产品类型是" + jj.data.product_name,
"target": { "id": jj.salesman_id, "name": jj.salesman_name }, "sender": "管理员",
} "sender_id":0,
if (jj.product_code == "ICP" || jj.product_code == "EDI" || jj.product_code == "ICPANNUALREPORT" || jj.product_code == "EDIANNUALREPORT") { "msgType": "single",
msg.app_key = "5ae2da88-0ced-4b7a-98ea-60d5e1ff7e2e"; "target": { "id": jj.data.salesman_id, "name": jj.data.salesman_name },
msg.jump_address = "deliveryAll" }
} if (jj.data.product_code == "ICP" || jj.data.product_code == "EDI" || jj.data.product_code == "ICPANNUALREPORT" || jj.data.product_code == "EDIANNUALREPORT") {
else { msg.app_key = "5ae2da88-0ced-4b7a-98ea-60d5e1ff7e2e";
msg.app_key = "42d814c1-4daa-4643-88b2-f5dd3ec853f3"; msg.jump_address = "deliveryAll"
msg.jump_address = "myDeliver" }
else {
msg.app_key = "42d814c1-4daa-4643-88b2-f5dd3ec853f3";
msg.jump_address = "myDeliver"
}
await this.msgService.create(msg);
} }
await this.msgService.create(msg);
return { return {
"status": 1, //1代表成功，否则失败 "status": 1, //1代表成功，否则失败
"msg": "", "msg": "",
......
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