tj

center-channel/app/base/api/impl/opaction/order.js

@@ -39,6 +39,12 @@ class ProductAPI extends APIBase {
             case "getOrderDeliveryFlowInfo"://获取订单交付流程信息
                 opResult = await this.utilsOrderSve.getOrderDeliveryFlowInfo(pobj, pobj.actionBody);
                 break;
+            case "getOrderDeliveryFlowList"://获取订单交付流程列表信息
+                opResult = await this.utilsOrderSve.getOrderDeliveryFlowList(pobj, pobj.actionBody);
+                break;
+            case "getOrderLogInfo"://获取订单日志信息
+                opResult = await this.utilsOrderSve.getOrderLogInfo(pobj, pobj.actionBody);
+                break;
             // case "getIcbcOrderDetails"://获取工商详情
             //     opResult = await this.utilsOrderSve.addOrder(pobj, pobj.actionBody);
             //     break;

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

@@ -97,7 +97,26 @@ class UtilsOrderService extends AppServiceBase {
     var reqUrl = this.centerOrderUrl + "action/order/springBoard";
     var result = await this.restPostUrl(pobj, reqUrl);
     return result;
-  }  
+  }
+  async getOrderDeliveryFlowList(pobj, actionBody) {
+    if (!actionBody.sourceOrderNoList) {
+      return system.getResult(null, "actionBody.sourceOrderNoList can not be empty");
+    }
+    if (actionBody.sourceOrderNoList.length == 0) {
+      return system.getResult(null, "actionBody.sourceOrderNoList length can not be empty");
+    }
+    var reqUrl = this.centerOrderUrl + "action/order/springBoard";
+    var result = await this.restPostUrl(pobj, reqUrl);
+    return result;
+  }
+  async getOrderLogInfo(pobj, actionBody) {
+    if (!actionBody.sourceOrderNo) {
+      return system.getResult(null, "actionBody.sourceOrderNo can not be empty");
+    }
+    var reqUrl = this.centerOrderUrl + "action/order/springBoard";
+    var result = await this.restPostUrl(pobj, reqUrl);
+    return result;
+  }
   async icOrderStatusNotify(pobj, actionBody) {
     if (!actionBody.orderNo) {
       return system.getResult(null, "actionBody.orderNo can not be empty");
@@ -106,7 +125,7 @@ class UtilsOrderService extends AppServiceBase {
     var result = await this.restPostUrl(pobj, reqUrl);
     return result;
   }
-  
+
   /**
    * 获取H5支付地址
    * @param {*} pobj 

center-channel/app/config/routes/api.js

@@ -50,8 +50,9 @@ module.exports = function (app) {
 		req.body.appInfo = result.data;
 		req.body.actionProcess = result.data.app_code;
 		var lst = [
-			"addOrder", "getH5PayUrl", "getOrderQrCode", "queryOrderStatus", "getOrderInfo", "getOrderDeliveryInfo", "getOrderDeliveryFlowInfo",
-			"getNeedInfo",
+			"addOrder", "getH5PayUrl", "getOrderQrCode", "queryOrderStatus","getOrderInfo", "getOrderDeliveryInfo", 
+			"getOrderDeliveryFlowInfo", "getOrderDeliveryFlowList", "getOrderLogInfo",
+			"getNeedInfo",//---暂时没有用到
 			"tmConfirm", "updateTmInfo",
 			"updateNclInfo", "updateContacts",
 			"updateCustomerInfo", "addOrderAndDelivery",

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

@@ -4,8 +4,10 @@
 1. [下其他订单](#addOtherOrder)
 1. [获取H5支付链接](#getH5PayUrl)
 1. [获取订单列表信息](#getOrderInfo)
+1. [获取订单操作日志信息](#getOrderLogInfo)
 1. [获取工商订单交付流程信息](#getIcbcOrderDeliveryFlowInfo)
 1. [获取商标订单交付信息](#getTmOrderDeliveryInfo)
+1. [获取商标官文列表信息](#getTmOrderDeliveryFlowList)
 
 
 ## **<a name="addOrder"> 下商标订单</a>**
@@ -259,6 +261,43 @@
 
 ```
 
+## **<a name="getOrderLogInfo"> 获取订单操作日志信息</a>**
+[返回到目录](#menu)
+##### URL
+[/web/opaction/order/springBoard]
+#### 参数格式  `JSON`
+#### HTTP请求方式 `POST`
+#### 请求头中需要增加userpin（用户登录后的凭证）的值
+#### 渠道执行的类型 actionType：getOrderLogInfo
+
+
+``` javascript
+{  
+    "sourceOrderNo":"TM26202002271337mkgN"// Y 订单号
+}
+
+```
+
+#### 返回结果
+```javascript
+{
+    "status": 0,// 0为成功，否则失败
+    "msg": "success",
+    "data": [
+        {
+            "opContent": "您的订单成功支付，请等待服务人员联系您",// 内容
+            "created_at": "2020-02-28T18:45:44.000Z"//创建时间
+        },
+        {
+            "opContent": "您提交了订单，请及时支付",
+            "created_at": "2020-02-25T18:44:45.000Z"
+        }
+    ],
+    "requestId": "f21446617c5e46ad889f3fab7bb69456"
+}
+
+```
+
 ## **<a name="getIcbcOrderDeliveryFlowInfo"> 获取工商订单交付流程信息</a>**
 [返回到目录](#menu)
 ##### URL
@@ -316,7 +355,7 @@
 
 ``` javascript
 {
-    "orderNo":"OT31202002191453Hpib33"// Y 订单号
+    "orderNo":"TM26202002271337mkgN"// Y 订单号
 }
 
 ```
@@ -381,4 +420,52 @@
     "requestId": "fe7bb14275d94b48a041c371dfde50aa"
 }
 
-```
\ No newline at end of file
+```
+
+## **<a name="getTmOrderDeliveryFlowList"> 获取商标官文列表信息</a>**
+[返回到目录](#menu)
+##### URL
+[/web/opaction/order/springBoard]
+#### 参数格式  `JSON`
+#### HTTP请求方式 `POST`
+#### 请求头中需要增加userpin（用户登录后的凭证）的值
+#### 渠道执行的类型 actionType：getOrderDeliveryFlowList
+
+``` javascript
+{
+    "sourceOrderNoList":["29471633","29956232"]// Y 商标申请号
+}
+
+```
+
+#### 返回结果
+```javascript
+{
+    "status": 0,// 0为成功，否则失败
+    "msg": "success",
+    "data": [
+        {
+            "sourceOrderNo": "29471633",
+            "flowList": {
+                "updated": "2020-02-19T06:53:09.000Z",// 创建时间
+                "deliveryStatus": "13",//官文状态编码
+                "uploadFileName": "29471633-注册-PASSED.pdf",//上传文件名称
+                "returnReceiptUrl": "http://gsb-public.oss-cn-beijing.aliyuncs.com/netsharp_Z7wfENwQZDWiWFbMsSchDkFJKfBb3Ah4.jpg",//官文回执Url
+                "deliveryStatusName": "已下发商标注册证"//官文状态名称
+            }
+        },
+        {
+            "sourceOrderNo": "29956232",
+            "flowList": {
+                "updated": "2020-02-20T06:53:09.000Z",
+                "deliveryStatus": "3",
+                "uploadFileName": "29956232-已受理-RECVED.pdf",
+                "returnReceiptUrl": "http://gsb-public.oss-cn-beijing.aliyuncs.com/netsharp_bj38cY3ZkN4AGj48kQGNSEaSMECJXN5c.pdf",
+                "deliveryStatusName": "已受理"
+            }
+        }
+    ],
+    "requestId": "97b78e24d2a441dca525d36af9b7c75d"
+}
+
+```