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

center-channel/app/base/api/impl/action/tmQuery.js

@@ -102,6 +102,24 @@ class TmQueryAPI extends WEBBase {
             case "getNclByCode":
                 opResult = await this.toolSve.getNclByCode(pobj,req);
                 break;
+            case "tmstatistics": //商标统计接口总量、有效、申请
+                opResult = await this.tmquerySve.tmstatistics(pobj,req);
+                break;
+            case "tmcompanystatistics": //商标统计接口公司总量
+                opResult = await this.tmquerySve.tmcompanystatistics(pobj,req);
+                break;
+            case "tmaddrstatisticsrank"://商标地区分布统计排名
+                opResult = await this.tmquerySve.tmaddrstatisticsrank(pobj,req);
+                break;
+            case "tmcompanystatisticsrank": //商标企业分布统计排名
+                opResult = await this.tmquerySve.tmcompanystatisticsrank(pobj,req);
+                break;
+            case "tmnclstatisticsrank": //商标类别申请排名
+                opResult = await this.tmquerySve.tmnclstatisticsrank(pobj,req);
+                break;
+            case "tmtrend": //商标申请及注册趋势
+                opResult = await this.tmquerySve.tmtrend(pobj,req);
+                break;
             default:
                 opResult = system.getResult(null, "action_type参数错误");
                 break;

center-channel/app/base/service/impl/trademark/tmquerySve.js

@@ -74,6 +74,42 @@ class TmqueryService {
     return await this.opReqResult(url, queryobj, req);
   }
 
+  //商标统计接口总量、有效、申请
+  async tmstatistics(queryobj, req) {
+    var url = this.zcApiUrl + "api/trademark/tmqueryApi/tmstatistics";
+    return await this.opReqResult(url, queryobj, req);
+  }
+
+  //商标统计接口公司总量
+  async tmcompanystatistics(queryobj, req) {
+    var url = this.zcApiUrl + "api/trademark/tmqueryApi/tmcompanystatistics";
+    return await this.opReqResult(url, queryobj, req);
+  }
+
+  //商标地区分布统计排名
+  async tmaddrstatisticsrank(queryobj, req) {
+    var url = this.zcApiUrl + "api/trademark/tmqueryApi/tmaddrstatisticsrank";
+    return await this.opReqResult(url, queryobj, req);
+  }
+
+  //商标企业分布统计排名
+  async tmcompanystatisticsrank(queryobj, req) {
+    var url = this.zcApiUrl + "api/trademark/tmqueryApi/tmcompanystatisticsrank";
+    return await this.opReqResult(url, queryobj, req);
+  }
+
+  //商标类别申请排名
+  async tmnclstatisticsrank(queryobj, req) {
+    var url = this.zcApiUrl + "api/trademark/tmqueryApi/tmnclstatisticsrank";
+    return await this.opReqResult(url, queryobj, req);
+  }
+
+  //商标申请及注册趋势
+  async tmtrend(queryobj, req) {
+    var url = this.zcApiUrl + "api/trademark/tmqueryApi/tmtrend";
+    return await this.opReqResult(url, queryobj, req);
+  }
+
   async tmreport(queryobj, pobj,req) {
     if (!queryobj.type) {
       return { code: -102, msg: "参数错误" }

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

@@ -26,25 +26,29 @@ class UtilsTmOrderCallService extends AppServiceBase {
       uapp_id: this.aliUappId
     }
     var url = this.centerOrderUrl + "action/order/springBoard";
-    var res = await this.restPostUrl(pobj, url);
-    console.log(res);
+    var orderInfoRes = await this.restPostUrl(pobj, url);
     // 2查询渠道/商品为icp/edi的订单已经支付尾款的订单。
     // 3
     var obj = {
-      BuyerStatus: 11,
-      PageNum: 1,
-      PageSize: 20,
-      SortFiled: "updateTime",
-      SortOrder: "DESC",
+      // BuyerStatus: 11,
+      // PageNum: 1,
+      // PageSize: 20,
+      // SortFiled: "updateTime",
+      // SortOrder: "DESC",
     };
     var object = {
       action: "QueryTradeProduceList",
       reqbody: obj,
       type: 'TM'
     }
-    let orderList = await this.aliclient.reqbyget(object);
-    console.log("orderList",orderList)
-    return system.getResultSuccess(orderList);
+    let aliOrderList = await this.aliclient.reqbyget(object);
+    if(orderInfoRes) {
+      for(var i = 0; i < orderInfoRes.length;i++) {
+        var orderInfo = orderInfo[i];
+      }
+    }
+    console.log("aliOrderList",aliOrderList)
+    return aliOrderList;
   }
 
   async createjsonfile() {