Skip to content

Z
zhichan
Commit aac5e3bb by 兰国旗
Options

jiejuechongtu

parents cdaf4ed0 964ca9e2
Showing with 290 additions and 26 deletions
center-channel/app/base/api/impl/action/product.js
...@@ -5,6 +5,7 @@ class ProductAPI extends WEBBase { ...@@ -5,6 +5,7 @@ class ProductAPI extends WEBBase {
constructor() { constructor() {
super(); super();
this.utilsProductSve = system.getObject("service.utilsSve.utilsProductSve"); this.utilsProductSve = system.getObject("service.utilsSve.utilsProductSve");
this.utils360Sve = system.getObject("service.utilsSve.utils360Sve");
} }
/** /**
* 接口跳转-POST请求 * 接口跳转-POST请求
...@@ -40,6 +41,12 @@ class ProductAPI extends WEBBase { ...@@ -40,6 +41,12 @@ class ProductAPI extends WEBBase {
case "getProductRecommend": case "getProductRecommend":
opResult = await this.utilsProductSve.getProductRecommend(pobj,pobj.actionBody); opResult = await this.utilsProductSve.getProductRecommend(pobj,pobj.actionBody);
break; break;
// case "updateProductPrice":
// opResult = await this.utilsProductSve.updateProductPrice(pobj,pobj.actionBody);
// break;
case "getGoodsLowestPrice":
opResult = await this.utils360Sve.getGoodsLowestPrice(pobj.actionBody);
break;
default: default:
opResult = system.getResult(null, "action_type参数错误"); opResult = system.getResult(null, "action_type参数错误");
} }
......
center-channel/app/base/api/impl/action/tmQuery.js
...@@ -141,6 +141,9 @@ class TmQueryAPI extends WEBBase { ...@@ -141,6 +141,9 @@ class TmQueryAPI extends WEBBase {
case "findTrademarkNamejuhe": //根据商标名称模糊查询,商标注册地域/大类分布 case "findTrademarkNamejuhe": //根据商标名称模糊查询,商标注册地域/大类分布
opResult = await this.tmquerySve.findTrademarkNamejuhe(action_body,req); opResult = await this.tmquerySve.findTrademarkNamejuhe(action_body,req);
break; break;
case "checkName": //根据商标名称模糊查询,商标注册地域/大类分布
opResult = await this.tmquerySve.checkName(action_body,req);
break;
default: default:
opResult = system.getResult(null, "action_type参数错误"); opResult = system.getResult(null, "action_type参数错误");
break; break;
......
center-channel/app/base/api/impl/opaction/order.js
...@@ -68,6 +68,9 @@ class ProductAPI extends WEBBase { ...@@ -68,6 +68,9 @@ class ProductAPI extends WEBBase {
case "getUsuallyContacts"://查询常用联系人、申请人 case "getUsuallyContacts"://查询常用联系人、申请人
opResult = await this.utilsOrderSve.getUsuallyContacts(pobj,pobj.actionBody); opResult = await this.utilsOrderSve.getUsuallyContacts(pobj,pobj.actionBody);
break; break;
case "pushTest":
opResult = await this.utilsOrderSve.pushTest(pobj,pobj.actionBody);
break;
default: default:
opResult = system.getResult(null, "action_type参数错误"); opResult = system.getResult(null, "action_type参数错误");
break; break;
......
center-channel/app/base/api/impl/opreceive/need.js
...@@ -51,6 +51,9 @@ class Need extends APIBase { ...@@ -51,6 +51,9 @@ class Need extends APIBase {
break; break;
case "getSolutionByChannelSolutionNo": case "getSolutionByChannelSolutionNo":
opResult = await this.utilsNeedSve.getItemByChannelNeedNo(pobj, pobj.actionBody); opResult = await this.utilsNeedSve.getItemByChannelNeedNo(pobj, pobj.actionBody);
break
case "getSolutionByChannelSolutionNo":
opResult = await this.utilsNeedSve.getSolutionByChannelSolutionNo(pobj, pobj.actionBody);
break; break;
case "getItemByNeedNo": case "getItemByNeedNo":
opResult = await this.utilsNeedSve.getItemByNeedNo(pobj, pobj.actionBody); opResult = await this.utilsNeedSve.getItemByNeedNo(pobj, pobj.actionBody);
......
center-channel/app/base/service/impl/common/baseCenterOrderSve.js
...@@ -14,7 +14,8 @@ const wangwenStatusDisct = { ...@@ -14,7 +14,8 @@ const wangwenStatusDisct = {
//区分渠道的uappid //区分渠道的uappid
const uappId = { const uappId = {
'ali':"18", //(阿里icp、edi) 'ali':"18", //(阿里icp、edi)
'baidu':"44" //(百度icp、edi) 'baidu':"44", //(百度icp、edi)
'zc360':"50" //360icp、edi
} }
//tui song baidu zhuanyong pinyin 2020-11-6 //tui song baidu zhuanyong pinyin 2020-11-6
const cityLetter = { const cityLetter = {
...@@ -79,6 +80,7 @@ class BaseCenterOrderService extends AppServiceBase { ...@@ -79,6 +80,7 @@ class BaseCenterOrderService extends AppServiceBase {
this.utilsTmAliyunSve = system.getObject("service.utilsSve.utilsTmAliyunSve");//测试用 this.utilsTmAliyunSve = system.getObject("service.utilsSve.utilsTmAliyunSve");//测试用
this.opPushQueueUrl = settings.opPushQueueUrl(); this.opPushQueueUrl = settings.opPushQueueUrl();
this.baiduclient = system.getObject("util.baiduClient"); this.baiduclient = system.getObject("util.baiduClient");
this.utils360Sve = system.getObject("service.utilsSve.utils360Sve")
}; };
//调用center-order //调用center-order
async reqCenterOrderApi(pobj, reqUrl) { async reqCenterOrderApi(pobj, reqUrl) {
...@@ -724,7 +726,18 @@ class BaseCenterOrderService extends AppServiceBase { ...@@ -724,7 +726,18 @@ class BaseCenterOrderService extends AppServiceBase {
var baiduFlag = -200 var baiduFlag = -200
} }
} }
if(aliFlag == 200 || baiduFlag == 200){
if(res.data.uapp_id == uappId.zc360){
pobj.pushObj = res.data;
let zc360 = await this.utils360Sve.pushOrderStatus(pobj);
if(zc360 && zc360.code == 200 && zc360.msg == 'ok' ){
var zc360Flag = 200
}else{
var zc360Flag = -200
}
}
if(aliFlag == 200 || baiduFlag == 200 || zc360Flag == 200){
return system.getResultSuccess(); return system.getResultSuccess();
} }
} }
......
center-channel/app/base/service/impl/trademark/tmquerySve.js
...@@ -162,6 +162,35 @@ class TmqueryService { ...@@ -162,6 +162,35 @@ class TmqueryService {
return await this.opReqResult(url, queryobj, req); return await this.opReqResult(url, queryobj, req);
} }
//核名接口
async checkName(queryobj,req){
if(!queryobj.cityname){
return system.getResult(-1,'cityname 不能为空！');
}
if(!queryobj.keyword){
return system.getResult(-1,'keyword 不能为空！');
}
if(!queryobj.btname){
return system.getResult(-1,'btname 不能为空！');
}
if(!queryobj.orgname){
return system.getResult(-1,'orgname 不能为空！');
}
let data = {
cityname:queryobj.cityname,
keyword:queryobj.keyword,
btname:queryobj.btname,
orgname:queryobj.orgname,
appkey:"5b29981785bd4272966b15ad8e8b9dd3"
}
let url = settings.icNameUrl() + 'api/icName/CheckName'
let result = await this.opReqResult(url, data, req);
if (result.Status!=200){
return system.getResult(-1,result.message);
}
return system.getResult(result.data);
}
async opReqResult(reqUrl, queryobj, req) { async opReqResult(reqUrl, queryobj, req) {
var rtn = await this.execClient.execPushDataPost(queryobj, reqUrl, req.headers["token"], req.headers["request-id"]); var rtn = await this.execClient.execPushDataPost(queryobj, reqUrl, req.headers["token"], req.headers["request-id"]);
var data = JSON.parse(rtn.stdout); var data = JSON.parse(rtn.stdout);
......
center-channel/app/base/service/impl/utilsSve/utils360Sve.js
...@@ -3,7 +3,7 @@ var settings = require("../../../../config/settings"); ...@@ -3,7 +3,7 @@ var settings = require("../../../../config/settings");
const AppServiceBase = require("../../app.base"); const AppServiceBase = require("../../app.base");
const md5 = require('md5') const md5 = require('md5')
//阿里支付类 //360 接口
class utils360Sve extends AppServiceBase { class utils360Sve extends AppServiceBase {
constructor() { constructor() {
super(); super();
...@@ -24,22 +24,23 @@ class utils360Sve extends AppServiceBase { ...@@ -24,22 +24,23 @@ class utils360Sve extends AppServiceBase {
if (orderResult.status != 0) { if (orderResult.status != 0) {
return orderResult; return orderResult;
} }
pobj.actionType ="getOrderDeliveryInfo"; pobj.actionType = "getOrderDeliveryInfo";
var deliveryResult = await this.restPostUrl(pobj,orderUrl); var deliveryResult = await this.restPostUrl(pobj, orderUrl);
if (deliveryResult.status != 0) { if (deliveryResult.status != 0) {
return deliveryResult; return deliveryResult;
} }
let sku_id = orderResult.data.orderProduct.itemCode; let sku_id = orderResult.data.orderProduct.itemCode; // 渠道方sku
let price = Number(orderResult.data.orderProduct.price)*100; let price = Number(orderResult.data.receiptVoucher.totalSum) * 100; //总价
let quantity = orderResult.data.orderProduct.quantity; let quantity = orderResult.data.orderProduct.quantity; //数量
let amount = Number(orderResult.data.receiptVoucher.totalSum)*100; let amount = Number(orderResult.data.receiptVoucher.totalSum) * 100; //总价
let order_id = orderResult.data.receiptVoucher.sourceOrderNo; let order_id = orderResult.data.receiptVoucher.sourceOrderNo; //订单号
let consignee = deliveryResult.data.orderContact.contactName; let consignee = deliveryResult.data.orderContact.contactName; //联系人
let mobile = deliveryResult.data.orderContact.mobile; let mobile = deliveryResult.data.orderContact.mobile; //手机号
let email = deliveryResult.data.orderContact.email; let email = deliveryResult.data.orderContact.email; //邮箱
// 加密签
let singStr = sku_id + quantity + price + amount + order_id + pobj.appInfo.uapp_secret; let singStr = sku_id + quantity + price + amount + order_id + pobj.appInfo.uapp_secret;
let sign = md5(singStr).toUpperCase(); let sign = md5(singStr).toUpperCase();
let result ={ let result = {
sku_id, sku_id,
price, price,
quantity, quantity,
...@@ -56,23 +57,23 @@ class utils360Sve extends AppServiceBase { ...@@ -56,23 +57,23 @@ class utils360Sve extends AppServiceBase {
//更新订单状态到360 //更新订单状态到360
async pushOrderStatus(pobj) { async pushOrderStatus(pobj) {
try { try {
var verifyResult = await this.verifyParam(pobj); // var verifyResult = await this.verifyParam(pobj);
if (verifyResult.status != 0) { // if (verifyResult.status != 0) {
return await this.disposePushResultFail(pobj, verifyResult, "status->pushOrderStatus->verifyResult", this.pushlogFailType.FAILLOG); // return await this.disposePushResultFail(pobj, verifyResult, "status->pushOrderStatus->verifyResult", this.pushlogFailType.FAILLOG);
} // }
var interface_params_info = verifyResult.data; // var interface_params_info = verifyResult.data;
let token = await this.utilsAuthSve.get360Token(); let token = await this.utilsAuthSve.get360Token();
let url = interface_params_info.opUrl + '?token=' + token.access_token; let url = settings.pushUrl360() + 'api/v1/eshop/GsbOrderUpdate?token=' + token.access_token;
let order_id = pobj.actionBody.orderNo; let order_id = pobj.actionBody.orderNo;
let ApplicationStatus = pobj.pushObj.ApplicationStatus; let ApplicationStatus = pobj.pushObj.ApplicationStatus;
let status = 0; let status = 30;
if (Number(ApplicationStatus) < 508) { if (Number(ApplicationStatus) > 510) {
status = 30
} else {
status = 40; status = 40;
} }
let pushObj = { let pushObj = {
order_id, status order_id,
status,
sub_status: Number(ApplicationStatus)
} }
let result = await this.restPostUrl(pushObj, url); let result = await this.restPostUrl(pushObj, url);
if (result.code == 200) { if (result.code == 200) {
...@@ -124,6 +125,24 @@ class utils360Sve extends AppServiceBase { ...@@ -124,6 +125,24 @@ class utils360Sve extends AppServiceBase {
return verify; return verify;
} }
//获取360最低价格
async getGoodsLowestPrice(actionBody) {
if (!actionBody.itemCode) {
return system.getResultFail(-1, 'itemCode 不能为空！')
}
let params = actionBody.itemCode.join(',');
let url = settings.requestUrl360() + `api/v1/eshop/GetGoodsLowestPrice?sku_ids=${params}`;
let rtn = await this.restClient.execGet("",url);
if (!rtn || !rtn.stdout) {
return system.getResult(null, "restGet data is empty");
}
let result = JSON.parse(rtn.stdout);
if(result.code != 200){
return system.getResultFail(-1,result.msg)
}
return system.getResultSuccess(result.data);
}
} }
module.exports = utils360Sve; module.exports = utils360Sve;
center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js
...@@ -17,6 +17,7 @@ class UtilsOrderService extends AppServiceBase { ...@@ -17,6 +17,7 @@ class UtilsOrderService extends AppServiceBase {
this.centerAppUrl = settings.centerAppUrl(); this.centerAppUrl = settings.centerAppUrl();
this.centerAppPayUrl = settings.centerAppUrl() + "payment/paymentApi/springBoard"; this.centerAppPayUrl = settings.centerAppUrl() + "payment/paymentApi/springBoard";
this.paySecret = settings.paySecret() this.paySecret = settings.paySecret()
this.utils360Sve = system.getObject("service.utilsSve.utils360Sve");
}; };
/* /*
* 订单验证 * 订单验证
...@@ -974,6 +975,22 @@ class UtilsOrderService extends AppServiceBase { ...@@ -974,6 +975,22 @@ class UtilsOrderService extends AppServiceBase {
pobj.actionBody = pushRet.data; pobj.actionBody = pushRet.data;
this.utilsPushSve.aliBusiness2Delivery(pobj, "pushDeliveryOrder"); this.utilsPushSve.aliBusiness2Delivery(pobj, "pushDeliveryOrder");
} }
//订单状态 已接单 目前360在用
if(pobj.appInfo.uapp_id == '50'){
pobj.actionBody.orderNo = params.orderNo;
let ApplicationStatus = 30;
if(opOrderResult.data.product_info.channel_item_code == 'zzsbzc'){
ApplicationStatus = 2;
}
if(opOrderResult.data.product_info.channel_item_code == 'fzsbzc' || opOrderResult.data.product_info.channel_item_code == 'dbsbzc'){
ApplicationStatus = 1;
}
pobj.pushObj = {
ApplicationStatus
};
this.utils360Sve.pushOrderStatus(pobj)
}
opOrderResult.data = null; opOrderResult.data = null;
return opOrderResult; return opOrderResult;
} catch (e) { } catch (e) {
...@@ -1397,5 +1414,12 @@ class UtilsOrderService extends AppServiceBase { ...@@ -1397,5 +1414,12 @@ class UtilsOrderService extends AppServiceBase {
let result = await this.restPostUrl(pobj, url); let result = await this.restPostUrl(pobj, url);
return result; return result;
} }
//测试
async pushTest(pobj,actionBody){
let url = this.centerOrderUrl + "notifyaction/internalCallsNotify/updateTmStatus";
let result = await this.restPostUrl(actionBody,url);
return result
}
} }
module.exports = UtilsOrderService; module.exports = UtilsOrderService;
center-channel/app/base/service/impl/utilsSve/utilsProductSve.js
...@@ -117,6 +117,20 @@ class UtilsProductService extends AppServiceBase { ...@@ -117,6 +117,20 @@ class UtilsProductService extends AppServiceBase {
let url = settings.centerAppUrl() + "action/opProduct/springBoard"; let url = settings.centerAppUrl() + "action/opProduct/springBoard";
return await this.restPostUrl(pobj,url); return await this.restPostUrl(pobj,url);
} }
/**
* 修改产品销售价格
* @param pobj
* @param actionBody
* @returns {Promise<void>}
*/
async updateProductPrice(pobj,actionBody){
if(!actionBody.data || actionBody.data.length == 0){
return system.getResultFail(-1,'data is empty!');
}
let url = settings.centerAppUrl() + "action/opProduct/springBoard";
return await this.restPostUrl(pobj,url);
}
} }
module.exports = UtilsProductService; module.exports = UtilsProductService;
center-channel/app/config/settings.js
...@@ -275,6 +275,13 @@ var settings = { ...@@ -275,6 +275,13 @@ var settings = {
return "https://console.e.360.cn/"// return "https://console.e.360.cn/"//
} }
}, },
pushUrl360: function () {
if (this.env == "dev") {
return "http://180.163.239.98:38086/"// 360测试环境
} else {
return "https://tobadmin.e.360.cn/"//
}
},
aliUappId: function () { aliUappId: function () {
if (this.env == "dev") { if (this.env == "dev") {
return 18// uapp_id return 18// uapp_id
...@@ -282,6 +289,13 @@ var settings = { ...@@ -282,6 +289,13 @@ var settings = {
return 18// uapp_id return 18// uapp_id
} }
}, },
icNameUrl: function () {
if (this.env == "dev") {
return "https://icname.gongsibao.com/"
} else {
return "https://icname.gongsibao.com/"
}
},
apiconfig: { apiconfig: {
opLogUrl: function () { opLogUrl: function () {
return settings.reqEsAddr() + "center_channel_log/_doc?pretty"; return settings.reqEsAddr() + "center_channel_log/_doc?pretty";
......
center-channel/app/front/entry/public/apidoc/opTrademark/tmSearch.md
...@@ -20,12 +20,13 @@ ...@@ -20,12 +20,13 @@
1. [商标报告](#tmreport) 1. [商标报告](#tmreport)
1. [商标统计接口总量、有效、申请](#tmstatistics) 1. [商标统计接口总量、有效、申请](#tmstatistics)
1. [商标统计接口公司总量](#tmcompanystatistics) 1. [商标统计接口公司总量](#tmcompanystatistics)
1. [商标地区分布统计排名](#tmaddrstatisticsrank) 1. [商标地区分布统计排名](#tmaddrstmtatisticsrank)
1. [商标企业分布统计排名](#tmcompanystatisticsrank) 1. [商标企业分布统计排名](#tmcompanystatisticsrank)
1. [商标类别申请排名](#tmnclstatisticsrank) 1. [商标类别申请排名](#tmnclstatisticsrank)
1. [商标申请及注册趋势](#tmtrend) 1. [商标申请及注册趋势](#tmtrend)
1. [商标注册地域/大类分布 模糊](#findTrademarkNamejuhe) 1. [商标注册地域/大类分布 模糊](#findTrademarkNamejuhe)
1. [商标注册地域/大类分布 精准](#findTrademarkNameAccuratejuhe) 1. [商标注册地域/大类分布 精准](#findTrademarkNameAccuratejuhe)
1. [公司核名](#checkName)
...@@ -4360,4 +4361,138 @@ ...@@ -4360,4 +4361,138 @@
``` ```
## **<a name="checkName"> 公司核名</a>**
[返回到目录](#menu)
##### URL
[/web/action/tmQuery/springBoard]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### 渠道执行的类型 actionType：checkName
``` javascript
{
"actionType":"checkName",
"actionBody":{
"cityname": "北京",
"keyword": "小米",
"btname": "科技",
"orgname": "有限公司"
}
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "操作成功",
"data": {
"brandList": [],
"cityList": [],
"code": "200",
"identicalCityList": [],
"level": "低",
"msg": "查询完成",
"point": 1000,
"sensitiveList": [],
"similarCityList": [
{
"id": 0,
"levels": "高",
"name": "北京<em>小米</em>智能科技有限公司",
"per": 83,
"pinyin": "",
"title": "",
"type": ""
},
{
"id": 0,
"levels": "高",
"name": "北京<em>小米</em>数码科技有限公司",
"per": 83,
"pinyin": "",
"title": "",
"type": ""
},
{
"id": 0,
"levels": "高",
"name": "北京雷<em>小米</em>生物科技有限公司",
"per": 80,
"pinyin": "",
"title": "",
"type": ""
},
{
"id": 0,
"levels": "高",
"name": "北京<em>小米</em>诺娃教育科技有限公司",
"per": 76,
"pinyin": "",
"title": "",
"type": ""
},
{
"id": 0,
"levels": "高",
"name": "<em>小米</em>有品科技有限公司北京分公司",
"per": 74,
"pinyin": "",
"title": "",
"type": ""
},
{
"id": 0,
"levels": "中",
"name": "<em>小米</em>之家科技有限公司北京第九分公司",
"per": 68,
"pinyin": "",
"title": "",
"type": ""
},
{
"id": 0,
"levels": "中",
"name": "<em>小米</em>之家科技有限公司北京第五分公司",
"per": 68,
"pinyin": "",
"title": "",
"type": ""
},
{
"id": 0,
"levels": "中",
"name": "<em>小米</em>之家科技有限公司北京第十五分公司",
"per": 66,
"pinyin": "",
"title": "",
"type": ""
},
{
"id": 0,
"levels": "中",
"name": "<em>小米</em>之家科技有限公司北京第三分公司",
"per": 68,
"pinyin": "",
"title": "",
"type": ""
},
{
"id": 0,
"levels": "中",
"name": "<em>小米</em>之家科技有限公司北京第十分公司",
"per": 68,
"pinyin": "",
"title": "",
"type": ""
}
]
},
"bizmsg": "empty",
"requestId": "e5f851eca2174ae1a1a163226fc405cd"
}
```
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