Skip to content

Z
zhichan
Commit d8a00f6a by 宋毅
Options

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

parents 838fffe1 d9b29635
Showing with 131 additions and 55 deletions
center-channel/app/base/api/impl/action/patentQuery.js
...@@ -7,11 +7,14 @@ class PatentQueryAPI extends WEBBase { ...@@ -7,11 +7,14 @@ class PatentQueryAPI extends WEBBase {
} }
/** /**
* 接口跳转-POST请求 * 接口跳转-POST请求
* action_type 执行的类型 * action_type 执行的类型
* action_body 执行的参数 * action_body 执行的参数
*/ */
async springBoard(pobj, qobj, req) { async springBoard(pobj, qobj, req) {
console.log("==================================================");
console.log(pobj);
console.log("==================================================");
if (!pobj.actionProcess) { if (!pobj.actionProcess) {
return system.getResult(null, "actionProcess参数不能为空"); return system.getResult(null, "actionProcess参数不能为空");
} }
...@@ -25,7 +28,7 @@ class PatentQueryAPI extends WEBBase { ...@@ -25,7 +28,7 @@ class PatentQueryAPI extends WEBBase {
async opActionProcess(pobj, action_type, req) { async opActionProcess(pobj, action_type, req) {
var opResult = null; var opResult = null;
switch (action_type) { switch (action_type) {
case "test"://测试 case "test": //测试
opResult = system.getResultSuccess(null, "测试成功"); opResult = system.getResultSuccess(null, "测试成功");
break; break;
case "CommomSearchbyApplicant"://根据申请人查询聚合 case "CommomSearchbyApplicant"://根据申请人查询聚合
...@@ -39,6 +42,10 @@ class PatentQueryAPI extends WEBBase { ...@@ -39,6 +42,10 @@ class PatentQueryAPI extends WEBBase {
case "worksCountByAuthor"://根据公司名称得到著作权量 case "worksCountByAuthor"://根据公司名称得到著作权量
case "worksListByAuthor"://根据公司名称得到著作权详情 case "worksListByAuthor"://根据公司名称得到著作权详情
case "worksDetailsByregNum"://根据登记号获取著作权详情 case "worksDetailsByregNum"://根据登记号获取著作权详情
case "CommomSearchbyTitle"://根据标题查询聚合
case "CommomSearchbyInventor"://根据发明人查询聚合
case "CommomSearchbyFilingno"://根据申请号查询聚合
case "CommomSearchbyPubno"://根据公开号查询聚合
opResult = await this.patentSve.opReqResult(pobj, req); opResult = await this.patentSve.opReqResult(pobj, req);
break; break;
default: default:
......
center-channel/app/base/api/impl/opreceive/need.js
...@@ -85,6 +85,9 @@ class Need extends APIBase { ...@@ -85,6 +85,9 @@ class Need extends APIBase {
case "confirmIcpIntention":// 2020 0827 lin 新增 4.3 用户需求确认 case "confirmIcpIntention":// 2020 0827 lin 新增 4.3 用户需求确认
opResult = await this.utilsNeedSve.confirmIcpIntention(pobj, pobj.actionBody); opResult = await this.utilsNeedSve.confirmIcpIntention(pobj, pobj.actionBody);
break; break;
case "needBatchUpload":// 2020 0827 lin 新增 4.3 用户需求确认
opResult = await this.utilsNeedSve.needBatchUpload(pobj, pobj.actionBody);
break;
case "testsymq": case "testsymq":
opResult = await this.utilsNeedSve.testsymq(pobj); opResult = await this.utilsNeedSve.testsymq(pobj);
break; break;
......
center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js
...@@ -44,11 +44,11 @@ class UtilsNeedService extends AppServiceBase { ...@@ -44,11 +44,11 @@ class UtilsNeedService extends AppServiceBase {
pobj.actionBody.type = pobj.actionBody.channel_type_code; pobj.actionBody.type = pobj.actionBody.channel_type_code;
if (pobj.actionBody.channel_type_code == 5) { if (pobj.actionBody.channel_type_code == 5) {
pobj.actionBody.type = "ali.icp"; pobj.actionBody.type = "ali.icp";
} else if (pobj.actionBody.channel_type_code == 7){ } else if (pobj.actionBody.channel_type_code == 7) {
pobj.actionBody.type = "ali.edi"; pobj.actionBody.type = "ali.edi";
} else if (pobj.actionBody.channel_type_code == "tmjy"){ } else if (pobj.actionBody.channel_type_code == "tmjy") {
pobj.actionBody.type = "ali.tmd"; pobj.actionBody.type = "ali.tmd";
} }
if (pobj.actionBody.description.indexOf("备#") < 0) { if (pobj.actionBody.description.indexOf("备#") < 0) {
pobj.actionBody.level = "A"; pobj.actionBody.level = "A";
...@@ -453,12 +453,25 @@ class UtilsNeedService extends AppServiceBase { ...@@ -453,12 +453,25 @@ class UtilsNeedService extends AppServiceBase {
var reqParams = { var reqParams = {
actionBody: { actionBody: {
intentionBizId: pobj.actionBody.intentionBizId, intentionBizId: pobj.actionBody.intentionBizId,
status: "followingUp" status: "followingUp",
userInfo: pobj.userInfo
}, },
opType: "updateChanceStatus", opType: "updateChanceStatus",
appInfo: pobj.appInfo appInfo: pobj.appInfo,
userInfo: pobj.userInfo
} }
self.utilsPushSve.aliBusiness2Delivery(reqParams, "updateChanceStatus"); self.utilsPushSve.aliBusiness2Delivery(reqParams, "updateChanceStatus");
// var reqParams = {
// actionBody: {
// "bizId": pobj.actionBody.intentionBizId,
// "follow_date": (new Date()).toISOString(),
// "follow_content": pobj.actionBody.note
// },
// opType: "updateChanceStatus",
// appInfo: pobj.appInfo,
// userInfo: pobj.userInfo
// }
// self.utilsPushSve.aliBusiness2Fq(pobj, "pushCloseICPNeed");
return system.getResultSuccess(); return system.getResultSuccess();
} }
...@@ -562,43 +575,50 @@ class UtilsNeedService extends AppServiceBase { ...@@ -562,43 +575,50 @@ class UtilsNeedService extends AppServiceBase {
// return system.getResult(null, "actionBody.userFeedBack can not be empty，100494"); // return system.getResult(null, "actionBody.userFeedBack can not be empty，100494");
// } // }
pobj.actionBody.data = []; pobj.actionBody.data = [];
await this.queryByAli(pobj,1); await this.queryByAli(pobj, 1);
pobj.actionType = "getUnCreated"; pobj.actionType = "getUnCreated";
let reqUrl = this.centerOrderUrl + "action/need/springBoard"; let reqUrl = this.centerOrderUrl + "action/need/springBoard";
let result = await this.restPostUrl(pobj, reqUrl); let result = await this.restPostUrl(pobj, reqUrl);
if (result.status == 0) { if (result.status == 0) {
pobj.actionBody = { pobj.actionBody = {
type:"tmjy" type: "tmjy"
}; };
for (let item of result.data){ for (let item of result.data) {
pobj.actionBody.intentionBizId=item.BizId; pobj.actionBody.intentionBizId = item.BizId;
pobj.actionBody.mobile=item.Mobile?item.Mobile:""; pobj.actionBody.mobile = item.Mobile ? item.Mobile : "";
pobj.actionBody.userName=item.UserName?item.UserName:""; pobj.actionBody.userName = item.UserName ? item.UserName : "";
pobj.notes=`${item.RegisterNumber?"RegisterNumber:"+item.RegisterNumber:""}${item.Classification?"Classification:"+item.Classification:""}`; pobj.notes = `${item.RegisterNumber ? "RegisterNumber:" + item.RegisterNumber : ""}${item.Classification ? "Classification:" + item.Classification : ""}`;
let res = await this.submitNeed(JSON.parse(JSON.stringify(pobj)),{intentionBizId:item.BizId}); let res = await this.submitNeed(JSON.parse(JSON.stringify(pobj)), { intentionBizId: item.BizId });
console.log(res) console.log(res)
} }
return system.getResultSuccess(); return system.getResultSuccess();
}else { } else {
return system.getResultFail(result.status,result.msg); return system.getResultFail(result.status, result.msg);
} }
return system.getResultFail(res.status,res.msg); return system.getResultFail(res.status, res.msg);
} }
async queryByAli(pobj,page){ async queryByAli(pobj, page) {
let res = await this.aliclient.reqbyget({ let res = await this.aliclient.reqbyget({
action: "QueryTradeIntentionUserList", reqbody: { action: "QueryTradeIntentionUserList", reqbody: {
Begin: pobj.actionBody.Begin ? pobj.actionBody.Begin : "", Begin: pobj.actionBody.Begin ? pobj.actionBody.Begin : "",
End: pobj.actionBody.End ? pobj.actionBody.End : "", End: pobj.actionBody.End ? pobj.actionBody.End : "",
PageNum: page, PageNum: page,
PageSize: 10, PageSize: 10,
}, apiVersion: "2019-05-08" }, apiVersion: "2019-05-08"
}); });
if (res.status == 0) { if (res.status == 0) {
pobj.actionBody.data.push(...res.data.Data); pobj.actionBody.data.push(...res.data.Data);
if (page < res.data.TotalPageNum){ if (page < res.data.TotalPageNum) {
await this.queryByAli(pobj,page+1) await this.queryByAli(pobj, page + 1)
} }
} }
}
// 2020 0914 lin 新增 刷单一条龙功能
async needBatchUpload(pobj,actionBody) {
for(var i = 0;i < actionBody.demands;i++) {
}
} }
async testsymq(pobj) { async testsymq(pobj) {
var a = null; var a = null;
......
center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js
...@@ -801,6 +801,32 @@ class UtilsOrderService extends AppServiceBase { ...@@ -801,6 +801,32 @@ class UtilsOrderService extends AppServiceBase {
async tmAccept(pobj) {// 2020 0828 lin 新增 ali商标交易 创建订单接口 async tmAccept(pobj) {// 2020 0828 lin 新增 ali商标交易 创建订单接口
try { try {
var actionBody = pobj.actionBody; var actionBody = pobj.actionBody;
// 检查商标注册号是否为上架
pobj.actionType = "tmStatusCheck";
pobj.actionBody.code = pobj.actionBody.registerNumber;
var url = settings.centerTmtransactionUrl() + "tmtransaction/action/trademarktransaction/springBoard";
var tmStatusCheckResult = await this.restPostUrl(pobj, url);
if(!tmStatusCheckResult.data) {
var result = {
"errorCode": "error",
"errorMsg": "标源状态不符合",
"module": { "orderNumber": "" },
"requestId": pobj.requestId,
"success": false
}
return result;
}
if(tmStatusCheckResult.data.publish_status != "uppershelf") {
var result = {
"errorCode": "error",
"errorMsg": "标源状态不符合",
"module": { "orderNumber": "" },
"requestId": pobj.requestId,
"success": false
}
return result;
}
//走addOrder流程
pobj.actionType = "getProductDetail"; pobj.actionType = "getProductDetail";
var url = settings.centerAppUrl() + "action/opProduct/springBoard"; var url = settings.centerAppUrl() + "action/opProduct/springBoard";
var productItemResult = await this.restPostUrl(pobj, url); var productItemResult = await this.restPostUrl(pobj, url);
...@@ -822,6 +848,15 @@ class UtilsOrderService extends AppServiceBase { ...@@ -822,6 +848,15 @@ class UtilsOrderService extends AppServiceBase {
var reqUrl = this.centerOrderUrl + "action/order/springBoard"; var reqUrl = this.centerOrderUrl + "action/order/springBoard";
pobj.actionBody.channelOrder.orderStatus = 64;// 2020 0908 lin 新增。64作为orderinfo的orderStatus的值。含义为已付部分款 pobj.actionBody.channelOrder.orderStatus = 64;// 2020 0908 lin 新增。64作为orderinfo的orderStatus的值。含义为已付部分款
var result = await this.restPostUrl(pobj, reqUrl); var result = await this.restPostUrl(pobj, reqUrl);
// 2020 0911 lin 新增 addOrder后修改标源状态
pobj.actionType = "tmStatusUpdate";
pobj.actionBody.tm = [{
id: tmStatusCheckResult.data.id,
code: tmStatusCheckResult.data.code
}]
pobj.actionBody.status = "lowershelf"
var url = settings.centerTmtransactionUrl() + "tmtransaction/action/trademarktransaction/springBoard";
var tmStatusUpdateResult = await this.restPostUrl(pobj, url);
if(result) { if(result) {
var tmResult = { var tmResult = {
"errorCode": "OK", "errorCode": "OK",
......
center-channel/app/base/service/impl/utilsSve/utilsTmOrderCallSve.js
...@@ -17,9 +17,13 @@ class UtilsTmOrderCallService extends AppServiceBase { ...@@ -17,9 +17,13 @@ class UtilsTmOrderCallService extends AppServiceBase {
PageSize: 20, PageSize: 20,
SortFiled: "updateTime", SortFiled: "updateTime",
SortOrder: "DESC", SortOrder: "DESC",
type: "TM"
}; };
let orderList = await this.aliclient.reqbyget({ action: "QueryTradeProduceList", reqbody: obj }); var object = {
action: "QueryTradeProduceList",
reqbody: obj,
type: 'TM'
}
let orderList = await this.aliclient.reqbyget(object);
console.log("orderList",orderList) console.log("orderList",orderList)
return system.getResultSuccess(orderList); return system.getResultSuccess(orderList);
} }
......
center-channel/app/config/routes/doc.js
...@@ -6,14 +6,14 @@ var marked = require("marked"); ...@@ -6,14 +6,14 @@ var marked = require("marked");
module.exports = function (app) { module.exports = function (app) {
app.get('/doc', function (req, res) { app.get('/doc', function (req, res) {
if (!req.query.key) { // if (!req.query.key) {
res.send("文件不存在！！！"); // res.send("文件不存在！！！");
return; // return;
} // }
if (req.query.key != "doc12345789") { // if (req.query.key != "doc12345789") {
res.send("文件不存在！！！！！！"); // res.send("文件不存在！！！！！！");
return; // return;
} // }
var path = process.cwd() + "/app/front/entry/public/apidoc/README.md"; var path = process.cwd() + "/app/front/entry/public/apidoc/README.md";
fs.readFile(path, function (err, data) { fs.readFile(path, function (err, data) {
if (err) { if (err) {
...@@ -43,16 +43,16 @@ module.exports = function (app) { ...@@ -43,16 +43,16 @@ module.exports = function (app) {
}); });
app.get('/doc/api/:forder/:fileName', function (req, res) { app.get('/doc/api/:forder/:fileName', function (req, res) {
if (req.url != "/doc/api/platform/fgbusinesschance.md") { // if (req.url != "/doc/api/platform/fgbusinesschance.md") {
if (!req.query.key) { // if (!req.query.key) {
res.send("文件不存在！！！"); // res.send("文件不存在！！！");
return; // return;
} // }
if (req.query.key != "doc12345789") { // if (req.query.key != "doc12345789") {
res.send("文件不存在！！！！！！"); // res.send("文件不存在！！！！！！");
return; // return;
} // }
} // }
var forder = req.params["forder"]; var forder = req.params["forder"];
var fileName = req.params["fileName"] || "README.md"; var fileName = req.params["fileName"] || "README.md";
var path = process.cwd() + "/app/front/entry/public/apidoc"; var path = process.cwd() + "/app/front/entry/public/apidoc";
......
center-channel/app/config/settings.js
...@@ -102,6 +102,13 @@ var settings = { ...@@ -102,6 +102,13 @@ var settings = {
return "http://center-app-service/"; return "http://center-app-service/";
} }
}, },
centerTmtransactionUrl: function () {
if (this.env == "dev") {
return "http://centerTmtransactioon.apps.com:4006/";
} else {
return "http://center-app-service/";
}
},
zzzdUrl: function () { zzzdUrl: function () {
if (this.env == "dev") { if (this.env == "dev") {
return "http://106.13.228.212:80"; return "http://106.13.228.212:80";
......
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