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

center-channel/app/base/service/impl/common/pushlogSve.js

@@ -75,7 +75,7 @@ class PushlogService extends ServiceBase {
     return system.getResultSuccess();
   }
   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 result = system.getResultSuccess(list);
     return result;

center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js

@@ -41,13 +41,16 @@ class UtilsNeedService extends AppServiceBase {
     pobj.actionBody.type_name = data.data.type_name;
     pobj.actionBody.channel_type_code = data.data.channel_type_code;
     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) {
       pobj.actionBody.type = "ali.icp";
-    } else {
+    } else  if (pobj.actionBody.channel_type_code == 7){
       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";
     } else {
       var levelurl = "http://106.13.228.212:8000/recProbability";
@@ -67,7 +70,6 @@ class UtilsNeedService extends AppServiceBase {
       if (pobj.actionBody.channel_type_code == "esp.companyreg") {
         this.utilsPushSve.aliBusiness2Fq(pobj, "pushNeedBusiness");
       } else {
-
         var reqParams = {
           actionBody: pobj.actionBody,
           appInfo: pobj.appInfo

center-channel/app/front/entry/public/apidoc/platform/trademarkReview.md

@@ -161,13 +161,13 @@
                 "evidenceCon": "", // 证据内容 文件
                 "evidenceSend": "", // 送达证据 文件
             },
-            "supData": { //补充材料 
-                "dir": "", // 补充证据目录
-                "con": "", // 补充证据内容
+            "supData": { //N 补充材料 
+                "dir": "", //N 补充证据目录
+                "con": "", //N 补充证据内容
             },
             "deliveryStatusName": "待完善材料"
-            "recDate":"",//接单时间
-            "askforDate":""//递交时间
+            "recDate":"",//N 接单时间
+            "askforDate":""//N 递交时间
         }
     }
 ```
@@ -177,12 +177,7 @@
     {
         "status": 0,// 0为成功，否则失败
         "msg": "success",
-        "data": {
-            "orderNo": "OT26202002151649kPgs",//订单号
-            "channelServiceNo": "OT26202002151649kPgs",//渠道服务单号
-            "channelOrderNo"："OT26202002151649kPgs", //渠道订单号
-            "channelParams": ""//渠道参数
-        },
+        "data": null,
         "requestId": "2f90fad8108b4933bb97c3d978b0fe10"
     }
 ```