Skip to content

Z
zhichan
Commit d7617878 by 王勇飞
Options

address pusher

parent c2a686b9
Showing with 91 additions and 72 deletions
fqboss/app/base/api/impl/customerInfoPusherApi.js
...@@ -21,75 +21,68 @@ class CustomerInfoPusherApi { ...@@ -21,75 +21,68 @@ class CustomerInfoPusherApi {
try { try {
//获取联系人信息(最少50条) //获取联系人信息(最少50条)
let resultTmCustomer = await this.trademarkS.queryTmCustomerInfo(orderNum); let resultTmCustomer = await this.trademarkS.queryTmCustomerInfo();
oneItem.tmCustomer = resultTmCustomer[0]; let tmCustomers = resultTmCustomer;
console.log("联系人信息：", JSON.stringify(tmCustomers));
//获取商标数据
let resultTm = await this.trademarkS.queryTmInfoForPush(); for (let i = 0; i < tmCustomers.length; i++) {
console.log('请求推送的数据成功：', resultTm.length); let obj = {};
let customerInfo = tmCustomers[i];
let oneItem = {}; let orderNum = customerInfo.orderNum;
// for (let i = 0; i < resultTm.length; i++) { //根据服务单号获取BizId(需求业务ID)
// let d = resultTm[i]; let bizResults = await this.trademarkS.queryTmInfo(orderNum);
// let orderNum = d.orderNum; let bizId = bizResults[0];
// let tmRegistNum = d.tmRegistNum;
// let order_no = d.channelOrderListInfo; console.log("bizId: " + JSON.stringify(bizId));
// oneItem.tm = d; //如果没有bizId,直接下一个
// //商标状态 if (!bizId) {
// oneItem.tmStatusName = d.tmStatusName; console.log("没有bizId");
// //获取商标申请人信息 continue;
// let tmapplierSql = "SELECT * FROM `h_tmapplier_info` WHERE orderNum='" + orderNum + "';"; }
// let resultApplier = await this.tmapplierinfoDao.customQuery(tmapplierSql); if (!bizId.businessId) {
// oneItem.tmApplier = resultApplier[0]; console.log("没有businessId");
continue;
// //获取联系人信息 }
obj.BizId = bizId;
// //获取官文信息, 一对多的关系，所以传入list obj.ContactAddress = customerInfo.contactAddress;
// let resultTmFlow = await this.trademarkS.queryTmFlowInfoForPush(tmRegistNum); obj.ContactName = customerInfo.customerContact;
// oneItem.tmFlow = resultTmFlow; obj.ContactNumber = customerInfo.mobile;
// console.log('收集商标信息完成--', i); obj.ContactEmail = customerInfo.email;
obj.ContactZipCode = customerInfo.zipCode;
// //调用推送接口推送oneItem
//调用阿里API推送到阿里
// let url = fqReqUrl + '/cloudapi/iduty/igirl/pushFollowUp'; let pushRes = await this.aliyunClient.post("CheckTmName", obj);
// let body = { console.log("推送完成:" + i, pushRes);
// 'order_no': order_no, //将成功结果写入到日志
// 'json': oneItem await this.oplogSve.create({
// }; logLevel: "info",
optitle: "推送联系人信息到阿里---异常",
// let res = await this.aliyunClient.postig(url, body); op: "app/base/api/impl/customerInfoPusherApi/collectInfo",
// console.log('推送完成--' + i, res); content: "参数:" + JSON.stringify(obj) + "返回结果:" + JSON.stringify(pushRes),
// //将成功结果写入到日志 clientIp: ""
// // await this.oplogSve.create({ });
// // logLevel: "info",
// // optitle: "推送商标数据至蜂擎---", //根据阿里接口返回的状态修改数据库中addressIsPushed的状态
// // op: "app/base/api/impl/tmInfoPusherApi.js/collectInfo", let pusherStatus = await this.trademarkS.updateTmCustomerInfo(orderNum);
// // content: "参数:" + JSON.stringify(body) + "返回结果:" + JSON.stringify(res), console.log("更新状态成功:", pusherStatus);
// // clientIp: "" }
// // });
// //更新isPushed字段为1
// await this.trademarkS.updateIsPushed(d.id);
// 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/customerInfoPusherApi/collectInfo",
// content: JSON.stringify(e.stack), content: JSON.stringify(e.stack),
// clientIp: "" clientIp: ""
// }); });
return e; return { code: -1, message: e };
} }
} }
} }
module.exports = TmInfoPusherApi; module.exports = CustomerInfoPusherApi;
\ No newline at end of file \ No newline at end of file
fqboss/app/base/api/impl/tmInfoPusherApi.js
...@@ -63,7 +63,7 @@ class TmInfoPusherApi { ...@@ -63,7 +63,7 @@ class TmInfoPusherApi {
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/collectInfo",
content: "参数:" + JSON.stringify(body) + "返回结果:" + JSON.stringify(res), content: "参数:" + JSON.stringify(body) + "返回结果:" + JSON.stringify(res),
clientIp: "" clientIp: ""
}); });
...@@ -80,11 +80,11 @@ class TmInfoPusherApi { ...@@ -80,11 +80,11 @@ class TmInfoPusherApi {
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/collectInfo",
content: JSON.stringify(e.stack), content: JSON.stringify(e.stack),
clientIp: "" clientIp: ""
}); });
return e; return { code: -1, message: e };
} }
} }
} }
......
fqboss/app/base/db/models/tmcustomerinfo.js
...@@ -11,6 +11,7 @@ module.exports = (db, DataTypes) => { ...@@ -11,6 +11,7 @@ module.exports = (db, DataTypes) => {
tel:DataTypes.STRING, tel:DataTypes.STRING,
fax:DataTypes.STRING, fax:DataTypes.STRING,
zipCode:DataTypes.STRING, zipCode:DataTypes.STRING,
addressIsPushed: DataTypes.INTEGER,//是否推送（0：未推送，1：已推送）
},{ },{
paranoid: true,//假的删除 paranoid: true,//假的删除
underscored: true, underscored: true,
......
fqboss/app/base/service/impl/trademarkSve.js
...@@ -1589,6 +1589,7 @@ class TrademarkService extends ServiceBase { ...@@ -1589,6 +1589,7 @@ class TrademarkService extends ServiceBase {
} }
} }
//商标信息查询-tm信息推送接口
async queryTmInfoForPush() { async queryTmInfoForPush() {
try { try {
let sql = "SELECT id,orderNum,tmFormType,tmName,picUrl,nclOneCodes,nclSmallCodes,principal,tmRegistNum,tmStatus,tmStatusName,tmSourceTypeName,channelOrderListInfo, businessId,`updated_at`,lastUp FROM `h_trade_mark` WHERE channelOrderListInfo NOT LIKE '%,%' AND channelOrderListInfo NOT LIKE '%，%' AND channelOrderListInfo IS NOT NULL AND channelOrderListInfo !='' AND isPushed!=1 LIMIT 200;"; let sql = "SELECT id,orderNum,tmFormType,tmName,picUrl,nclOneCodes,nclSmallCodes,principal,tmRegistNum,tmStatus,tmStatusName,tmSourceTypeName,channelOrderListInfo, businessId,`updated_at`,lastUp FROM `h_trade_mark` WHERE channelOrderListInfo NOT LIKE '%,%' AND channelOrderListInfo NOT LIKE '%，%' AND channelOrderListInfo IS NOT NULL AND channelOrderListInfo !='' AND isPushed!=1 LIMIT 200;";
...@@ -1612,14 +1613,38 @@ class TrademarkService extends ServiceBase { ...@@ -1612,14 +1613,38 @@ class TrademarkService extends ServiceBase {
} }
} }
//商标信息查询(bussinessId)-联系人地址信息推送接口
async queryTmInfo(orderNum) {
try {
let sql = "SELECT businessId FROM `h_trade_mark` WHERE orderNum = '" + orderNum + "' AND tmSourceType = '32';";
let tmResult = await this.dao.customQuery(sql);
return tmResult;
} catch (e) {
console.log('queryTmInfo查询失败');
return e;
}
}
//联系人信息查询-联系人地址信息推送接口 //联系人信息查询-联系人地址信息推送接口
async queryTmCustomerInfo(orderNum) { async queryTmCustomerInfo() {
try { try {
let sql = "SELECT orderNum,contactAddress,customerContact,mobile,email,zipCode FROM `h_tmcustomer_info` WHERE contactAddress != '' AND addressIsPushed = '0' LIMIT 50;"; 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) {
console.log('queryTmCustomerInfoForPush查询失败'); console.log('queryTmCustomerInfo查询失败');
return e;
}
}
//联系人信息更新-更新推送状态为1(已推送)
async updateTmCustomerInfo(orderNum) {
try {
let sql = "UPDATE `h_tmcustomer_info` SET addressIsPushed = '1' WHERE orderNum = '" + orderNum + "';";
let updateResult = await this.dao.customUpdate(sql);
return updateResult;
} catch (e) {
console.log('updateTmCustomerInfo更新失败');
return e; return e;
} }
} }
......
fqboss/app/base/utils/aliyunClient.js
const Client = require('aliyun-api-gateway').Client; const Client = require('aliyun-api-gateway').Client;
// const client = new Client('203727307', 'b6za34qem6k9a3s3jguvh24nc3ridlnh'); // const client = new Client('203727307', 'b6za34qem6k9a3s3jguvh24nc3ridlnh');//开发
const client = new Client('203732072', '3r0dn583041bco48lq0xgsw09r0hh6ew'); const client = new Client('203732072', '3r0dn583041bco48lq0xgsw09r0hh6ew');//线上
// const clientig = new Client('203756805', 'crkyej0xlmqa6bmvqijun6ltxparllyn');//开发 // const clientig = new Client('203756805', 'crkyej0xlmqa6bmvqijun6ltxparllyn');//开发
const clientig = new Client('203763771', 'e5e2ytnn6nrkr9qnqk4w5e6z0xlhkznu');//线上 const clientig = new Client('203763771', 'e5e2ytnn6nrkr9qnqk4w5e6z0xlhkznu');//线上
......
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