Skip to content

Z
zhichan
Commit 3c5c2c8b by 王勇飞
Options

pp

parent 34b3787d
Showing with 64 additions and 56 deletions
fqboss/app/base/api/impl/customerInfoPusherApi.js
...@@ -20,70 +20,73 @@ class CustomerInfoPusherApi { ...@@ -20,70 +20,73 @@ class CustomerInfoPusherApi {
async collectInfo() { async collectInfo() {
try { try {
//获取联系人信息(最少50条)
let resultTmCustomer = await this.trademarkS.queryTmCustomerInfo(orderNum);
oneItem.tmCustomer = resultTmCustomer[0];
//获取商标数据 //获取商标数据
let resultTm = await this.trademarkS.queryTmInfoForPush(); let resultTm = await this.trademarkS.queryTmInfoForPush();
console.log('请求推送的数据成功：', resultTm.length); console.log('请求推送的数据成功：', resultTm.length);
let oneItem = {}; let oneItem = {};
for (let i = 0; i < resultTm.length; i++) { // for (let i = 0; i < resultTm.length; i++) {
let d = resultTm[i]; // let d = resultTm[i];
let orderNum = d.orderNum; // let orderNum = d.orderNum;
let tmRegistNum = d.tmRegistNum; // let tmRegistNum = d.tmRegistNum;
let order_no = d.channelOrderListInfo; // let order_no = d.channelOrderListInfo;
oneItem.tm = d; // oneItem.tm = d;
//商标状态 // //商标状态
oneItem.tmStatusName = d.tmStatusName; // oneItem.tmStatusName = d.tmStatusName;
//获取商标申请人信息 // //获取商标申请人信息
let tmapplierSql = "SELECT * FROM `h_tmapplier_info` WHERE orderNum='" + orderNum + "';"; // let tmapplierSql = "SELECT * FROM `h_tmapplier_info` WHERE orderNum='" + orderNum + "';";
let resultApplier = await this.tmapplierinfoDao.customQuery(tmapplierSql); // let resultApplier = await this.tmapplierinfoDao.customQuery(tmapplierSql);
oneItem.tmApplier = resultApplier[0]; // oneItem.tmApplier = resultApplier[0];
//获取联系人信息 // //获取联系人信息
let resultTmCustomer = await this.trademarkS.queryTmCustomerInfoForPush(orderNum);
oneItem.tmCustomer = resultTmCustomer[0];
// //获取官文信息, 一对多的关系，所以传入list
//获取官文信息, 一对多的关系，所以传入list // let resultTmFlow = await this.trademarkS.queryTmFlowInfoForPush(tmRegistNum);
let resultTmFlow = await this.trademarkS.queryTmFlowInfoForPush(tmRegistNum); // oneItem.tmFlow = resultTmFlow;
oneItem.tmFlow = resultTmFlow; // console.log('收集商标信息完成--', i);
console.log('收集商标信息完成--', i);
// //调用推送接口推送oneItem
//调用推送接口推送oneItem
// let url = fqReqUrl + '/cloudapi/iduty/igirl/pushFollowUp';
let url = fqReqUrl + '/cloudapi/iduty/igirl/pushFollowUp'; // let body = {
let body = { // 'order_no': order_no,
'order_no': order_no, // 'json': oneItem
'json': oneItem // };
};
// let res = await this.aliyunClient.postig(url, body);
let res = await this.aliyunClient.postig(url, body); // console.log('推送完成--' + i, res);
console.log('推送完成--' + i, res); // //将成功结果写入到日志
//将成功结果写入到日志 // // await this.oplogSve.create({
await this.oplogSve.create({ // // logLevel: "info",
logLevel: "info", // // optitle: "推送商标数据至蜂擎---",
optitle: "推送商标数据至蜂擎---", // // op: "app/base/api/impl/tmInfoPusherApi.js/collectInfo",
op: "app/base/api/impl/tmInfoPusherApi.js/collectInfo", // // content: "参数:" + JSON.stringify(body) + "返回结果:" + JSON.stringify(res),
content: "参数:" + JSON.stringify(body) + "返回结果:" + JSON.stringify(res), // // clientIp: ""
clientIp: "" // // });
});
// //更新isPushed字段为1
//更新isPushed字段为1 // await this.trademarkS.updateIsPushed(d.id);
await this.trademarkS.updateIsPushed(d.id); // console.log('更新isPushed字段完成--', i);
console.log('更新isPushed字段完成--', i);
// }
}
return { code: 200, message: "调用推送接口成功" }; return { code: 200, message: "调用推送接口成功" };
} catch (e) { } catch (e) {
console.log('collectInfo error: ', e); console.log('collectInfo error: ', e);
//将错误写入到日志 //将错误写入到日志
await this.oplogSve.create({ // await this.oplogSve.create({
logLevel: "error", // logLevel: "error",
optitle: "推送商标数据至蜂擎---异常", // optitle: "推送商标数据至蜂擎---异常",
op: "app/base/api/impl/tmInfoPusherApi.js/collectInfo", // op: "app/base/api/impl/tmInfoPusherApi.js/collectInfo",
content: JSON.stringify(e.stack), // content: JSON.stringify(e.stack),
clientIp: "" // clientIp: ""
}); // });
return e; return e;
} }
} }
......
fqboss/app/base/db/dao.base.js
...@@ -54,7 +54,7 @@ class Dao { ...@@ -54,7 +54,7 @@ class Dao {
} }
orderBy() { orderBy() {
//return {"key":"include","value":{model:this.db.models.app}}; //return {"key":"include","value":{model:this.db.models.app}};
return [["lastUp", "DESC"]]; return [["created_at", "DESC"]];
} }
buildQuery(qobj) { buildQuery(qobj) {
var linkAttrs = []; var linkAttrs = [];
......
fqboss/app/base/db/impl/trademarkDao.js
...@@ -28,6 +28,10 @@ class TrademarkDao extends Dao { ...@@ -28,6 +28,10 @@ class TrademarkDao extends Dao {
return null; return null;
} }
} }
orderBy() {
//return {"key":"include","value":{model:this.db.models.app}};
return [["lastUp", "DESC"]];
}
extraWhere(obj, w) { extraWhere(obj, w) {
if (obj.codepath && obj.codepath != "") { if (obj.codepath && obj.codepath != "") {
if (obj.codepath.indexOf("alltrademark") < 0 && obj.codepath.indexOf("allfqtm") < 0) { if (obj.codepath.indexOf("alltrademark") < 0 && obj.codepath.indexOf("allfqtm") < 0) {
......
fqboss/app/base/service/impl/trademarkSve.js
...@@ -1615,7 +1615,7 @@ class TrademarkService extends ServiceBase { ...@@ -1615,7 +1615,7 @@ class TrademarkService extends ServiceBase {
//联系人信息查询-联系人地址信息推送接口 //联系人信息查询-联系人地址信息推送接口
async queryTmCustomerInfo(orderNum) { async queryTmCustomerInfo(orderNum) {
try { try {
let sql = "SELECT * FROM `h_tmcustomer_info` WHERE orderNum='" + orderNum + "';"; let sql = "SELECT orderNum,contactAddress,customerContact,mobile,email,zipCode FROM `h_tmcustomer_info` WHERE contactAddress != '' AND addressIsPushed = '0' LIMIT 50;";
let customerResult = await this.dao.customQuery(sql); let customerResult = await this.dao.customQuery(sql);
return customerResult; return customerResult;
} catch (e) { } catch (e) {
......
fqboss/app/config/routes/web.js
...@@ -259,6 +259,7 @@ module.exports = function (app) { ...@@ -259,6 +259,7 @@ module.exports = function (app) {
req.url.indexOf("ncloneCtl/getNcl") > 0 || req.url.indexOf("ncloneCtl/getNcl") > 0 ||
req.url.indexOf("orderCtl/getChannelOrderByOrderNum") > 0 || req.url.indexOf("orderCtl/getChannelOrderByOrderNum") > 0 ||
req.url.indexOf("tmInfoPusherCtl/pushInfo") > 0 || req.url.indexOf("tmInfoPusherCtl/pushInfo") > 0 ||
req.url.indexOf("customerInfoPusherCtl/pushInfo") > 0 ||
( (
req.headers.access_source=="zqq1571212637509" && req.headers.access_source=="zqq1571212637509" &&
( (
......
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