Skip to content

Z
zhichan
Commit 42538b27 by 庄冰
Options

alinotify

parent b0882298
Showing with 87 additions and 39 deletions
fqboss/app/base/api/impl/channelpushApi.js
...@@ -317,32 +317,59 @@ class ChannelPushApi{ ...@@ -317,32 +317,59 @@ class ChannelPushApi{
// officialFileName:"商标注册申请书", // officialFileName:"商标注册申请书",
// officialFileUrl:"http://www.baidu.com", pushChannelAssistTmData // officialFileUrl:"http://www.baidu.com", pushChannelAssistTmData
// };pushEditChannelAssistTmData // };pushEditChannelAssistTmData
// var co = { var co = {
// "org_name":"汉唐信通", "org_name":"汉唐信通",
// "operator_name":"庄冰", "operator_name":"庄冰",
// "order_pay_state":"待付款", "order_pay_state":"待付款",
// "order_state":"办理中", "order_state":"办理中",
// "order_company_name":"北京联大共享科技有限公司", "order_company_name":"北京联大共享科技有限公司",
// "customer_phone":"13075556693", "customer_phone":"13075556693",
// "customer_name":"测试李四", "customer_name":"测试李四",
// "customer_email":"2577638904@qq.com", "customer_email":"2577638904@qq.com",
// "order_price":0.01, "order_price":0.01,
// "payOneClassCount":1, "payOneClassCount":1,
// "needId":"OT18202003312235gT1S", "needId":"OT18202003312235gT1S",
// "order_no_class_count":[ "order_no_class_count":[
// { {
// "class_count":10, "class_count":10,
// "order_no":"100173202" "order_no":"100173202"
// } }
// ], ],
// "threeClassCount":10, "threeClassCount":10,
// "order_nos":[ "order_nos":[
// "100173202" "100173202"
// ], ],
// "oneClassCount":1, "oneClassCount":1,
// "payThreeClassCount":10 "payThreeClassCount":10
// }; };
// return this.channelreceiveSve.pushEditChannelAssistTmData("4u31585290678404","dbsbzc",co); var ooo={
"serviceNo":"60201912170812472800",
"isConfirm":"0",
"channelCode":"gsbh5",
"notes":"方案不通过了呀",
"appInfo":{
"id":17,
"app_hosts":"gsbweb.qifu.gongsibao.com",
"app_code":"gsbweb",
"app_name":"公司宝官网web应用",
"uapp_id":"22",
"uapp_key":"201912141625",
"uapp_secret":"8cbb846776874167b5c7e01cd0116c66",
"contact_name":"宋毅",
"contact_mobile":"15010929366",
"contact_email":null,
"is_enabled":1,
"is_sign":0,
"pay_type":"10",
"delivery_type":"10",
"created_at":"2020-03-11T22:13:48.000Z",
"version":0,
"token":"129806a0090746aba981eb8d9da5edec"
},
"product_id":46
};
// return this.channelreceiveSve.channelTmConfirm("4u31585290678404","gsbh5",co);
// return this.channelreceiveSve.channelTmConfirm(ooo);
} }
} }
module.exports=ChannelPushApi; module.exports=ChannelPushApi;
\ No newline at end of file
fqboss/app/base/api/impl/tmsub.js
...@@ -295,6 +295,10 @@ class TmSub { ...@@ -295,6 +295,10 @@ class TmSub {
content: JSON.stringify(pobj), content: JSON.stringify(pobj),
clientIp: "" clientIp: ""
}); });
result.code = -150;
result.msg = "渠道商标状态通知异常";
result.message = "渠道商标状态通知异常";
return result;
} }
} }
return result; return result;
......
fqboss/app/base/service/impl/trademarkSve.js
...@@ -1303,6 +1303,22 @@ class TrademarkService extends ServiceBase { ...@@ -1303,6 +1303,22 @@ class TrademarkService extends ServiceBase {
async opAliNotify(payStatus, tmStatus, pObj) {//阿里通知 async opAliNotify(payStatus, tmStatus, pObj) {//阿里通知
var self = this; var self = this;
var opDownFileResult = {};
if (pObj.fileUrl) {
var opUrlResult = {
code: 1,
message: "success",
data: {}
};
opDownFileResult = await self.opDownFileInfo(pObj.fileUrl, opUrlResult);
//日志记录
logCtl.info({
optitle: "阿里云返回的通知url操作文件url下载返回结果",
op: "/usr/node-dev/OMC/fqboss/app/base/service/impl/trademarkSve.js/opAliNotify",
content: "请求参数：" + JSON.stringify(pObj) + "，结果信息：" + JSON.stringify(opDownFileResult),
clientIp: ""
});
}
var item = await this.getItemById(null, pObj.bizId); var item = await this.getItemById(null, pObj.bizId);
if (!item) { if (!item) {
return { code: -100, msg: "没有相关业务id对应的商标信息" }; return { code: -100, msg: "没有相关业务id对应的商标信息" };
...@@ -1346,19 +1362,19 @@ class TrademarkService extends ServiceBase { ...@@ -1346,19 +1362,19 @@ class TrademarkService extends ServiceBase {
tmRegistNum: pObj.applyNo, tmRegistNum: pObj.applyNo,
}; };
if (pObj.fileUrl) { if (pObj.fileUrl) {
var opUrlResult = { // var opUrlResult = {
code: 1, // code: 1,
message: "success", // message: "success",
data: {} // data: {}
}; // };
var opDownFileResult = await self.opDownFileInfo(pObj.fileUrl, opUrlResult); // var opDownFileResult = await self.opDownFileInfo(pObj.fileUrl, opUrlResult);
//日志记录 // //日志记录
logCtl.info({ // logCtl.info({
optitle: "阿里云返回的通知url操作文件url下载返回结果", // optitle: "阿里云返回的通知url操作文件url下载返回结果",
op: "/usr/node-dev/OMC/fqboss/app/base/service/impl/trademarkSve.js/opAliNotify", // op: "/usr/node-dev/OMC/fqboss/app/base/service/impl/trademarkSve.js/opAliNotify",
content: "请求参数：" + JSON.stringify(pObj) + "，结果信息：" + JSON.stringify(opDownFileResult), // content: "请求参数：" + JSON.stringify(pObj) + "，结果信息：" + JSON.stringify(opDownFileResult),
clientIp: "" // clientIp: ""
}); // });
params["returnReceiptUrl"] = opDownFileResult.code == 1 ? opDownFileResult.data.url : pObj.fileUrl; params["returnReceiptUrl"] = opDownFileResult.code == 1 ? opDownFileResult.data.url : pObj.fileUrl;
} }
......
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