Skip to content

Z
zhichan
Commit b2ac9897 by linboxuan
Options

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

parents b270a0f3 5fd891bf
Showing with 13 additions and 16 deletions
center-channel/app/base/service/impl/common/pushlogSve.js
...@@ -75,7 +75,7 @@ class PushlogService extends ServiceBase { ...@@ -75,7 +75,7 @@ class PushlogService extends ServiceBase {
return system.getResultSuccess(); return system.getResultSuccess();
} }
async getPublicServiceLogList() { async getPublicServiceLogList() {
var sql = "SELECT id,appkey,`pushUrl`,pushContent,pushNumber,clientIp FROM `center_channel_public_servicelog` WHERE pushNumber<10 LIMIT 200"; var sql = "SELECT id,appkey,`pushUrl`,pushContent,pushNumber,clientIp FROM `center_channel_public_servicelog` WHERE pushNumber<10 LIMIT 10";
var list = await this.pushfaillogDao.customQuery(sql); var list = await this.pushfaillogDao.customQuery(sql);
var result = system.getResultSuccess(list); var result = system.getResultSuccess(list);
return result; return result;
......
center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js
...@@ -41,13 +41,16 @@ class UtilsNeedService extends AppServiceBase { ...@@ -41,13 +41,16 @@ class UtilsNeedService extends AppServiceBase {
pobj.actionBody.type_name = data.data.type_name; pobj.actionBody.type_name = data.data.type_name;
pobj.actionBody.channel_type_code = data.data.channel_type_code; pobj.actionBody.channel_type_code = data.data.channel_type_code;
pobj.actionBody.channel_type_name = data.data.channel_type_name; pobj.actionBody.channel_type_name = data.data.channel_type_name;
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 { } 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"){
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";
} else { } else {
var levelurl = "http://106.13.228.212:8000/recProbability"; var levelurl = "http://106.13.228.212:8000/recProbability";
...@@ -67,7 +70,6 @@ class UtilsNeedService extends AppServiceBase { ...@@ -67,7 +70,6 @@ class UtilsNeedService extends AppServiceBase {
if (pobj.actionBody.channel_type_code == "esp.companyreg") { if (pobj.actionBody.channel_type_code == "esp.companyreg") {
this.utilsPushSve.aliBusiness2Fq(pobj, "pushNeedBusiness"); this.utilsPushSve.aliBusiness2Fq(pobj, "pushNeedBusiness");
} else { } else {
var reqParams = { var reqParams = {
actionBody: pobj.actionBody, actionBody: pobj.actionBody,
appInfo: pobj.appInfo appInfo: pobj.appInfo
......
center-channel/app/front/entry/public/apidoc/platform/trademarkReview.md
...@@ -161,13 +161,13 @@ ...@@ -161,13 +161,13 @@
"evidenceCon": "", // 证据内容 文件 "evidenceCon": "", // 证据内容 文件
"evidenceSend": "", // 送达证据 文件 "evidenceSend": "", // 送达证据 文件
}, },
"supData": { //补充材料 "supData": { //N 补充材料
"dir": "", // 补充证据目录 "dir": "", //N 补充证据目录
"con": "", // 补充证据内容 "con": "", //N 补充证据内容
}, },
"deliveryStatusName": "待完善材料" "deliveryStatusName": "待完善材料"
"recDate":"",//接单时间 "recDate":"",//N 接单时间
"askforDate":""//递交时间 "askforDate":""//N 递交时间
} }
} }
``` ```
...@@ -177,12 +177,7 @@ ...@@ -177,12 +177,7 @@
{ {
"status": 0,// 0为成功，否则失败 "status": 0,// 0为成功，否则失败
"msg": "success", "msg": "success",
"data": { "data": null,
"orderNo": "OT26202002151649kPgs",//订单号
"channelServiceNo": "OT26202002151649kPgs",//渠道服务单号
"channelOrderNo"："OT26202002151649kPgs", //渠道订单号
"channelParams": ""//渠道参数
},
"requestId": "2f90fad8108b4933bb97c3d978b0fe10" "requestId": "2f90fad8108b4933bb97c3d978b0fe10"
} }
``` ```
......
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