tj

igirl-channel/app/base/api/impl/action/tmOrder.js

@@ -54,7 +54,7 @@ class TmOrderAPI extends APIBase {
         // action_body.app = { id:2,uappKey:"201911131657",uAppId:9,appSecret:"eeb18393aade40149287b024d8ba0850"};
         // action_body.user = { id: 6, app_id: 2, nickname: "测试用户",channelUserId:"testUserId01" };
         var opResult = null;
-        if (["subTmOrder", "getTmOrderList", "getTmOrderInfo", "getTmApplyInfo", "getTmNclList", "getNeedInfo",
+        if (["subOtherOrder", "subTmOrder", "getTmOrderList", "getTmOrderInfo", "getTmApplyInfo", "getTmNclList", "getNeedInfo",
             "tmConfirm", "updateTmInfo", "updateNclInfo", "updateContacts",
             "updateCustomerInfo", "addOrderAndDelivery", "updateOrderPayStatus"].indexOf(action_type) >= 0) {
             if (!action_body.channelUserId) {
@@ -109,8 +109,12 @@ class TmOrderAPI extends APIBase {
             case "get1688ChannelOrderInfo"://获取渠道订单信息
                 opResult = await this.ordertmproductSve.get1688ChannelOrder(action_body);
                 break;
+            case "subOtherOrder"://商标提报               
+                opResult = await this.ordertmproductSve.addOtherOrder(action_body, pobj, req);
+                break;
             case "subTmOrder"://商标提报               
                 opResult = await this.ordertmproductSve.addTmOrder(action_body, pobj, req);
+                if (["bw"].indexOf(action_process) < 0) {
                     if (opResult && opResult.status == 0 && opResult.data) {
                         var returnTms = opResult.data.tm;
                         for (var i = 0; i < pobj.actionBody.nclones.length; i++) {
@@ -128,6 +132,7 @@ class TmOrderAPI extends APIBase {
                         var url = this.pushFqbossDataUrl + "api/channelaccessApi/createChannelOrder"
                         this.pushData2(opResult, req, pobj, url);
                     }
+                }
                 break;
             case "subExistTmOrder"://提交存在商标提报               
                 opResult = await this.ordertmproductSve.addExistTmOrder(action_body);

igirl-channel/app/base/system.js

@@ -319,9 +319,9 @@ System.getAppInfoFail = 1130;
 //已经存在信息
 System.existData = 1400;
 
-//获取访问token失败
+//用户信息失败
 System.noUserFail = 2070;
-//获取访问token失败
+//用户信息禁用
 System.userDisable = 2080;
 
 module.exports = System;
\ No newline at end of file

igirl-channel/app/front/entry/public/apidoc/opTrademark/opTm.md

@@ -8,6 +8,7 @@
 1. [企业注册信息查询](#getEntregistryByCompanyName)
 1. [调整委托书](#adjustWTSSize)
 1. [接入方提供查询订单接口](#getInfo)
+1. [创建其他订单接口](#subOtherOrder)
 1. [商标提报](#subTmOrder)
 1. [商标交付列表](#getTmOrderList)
 1. [商标交付信息](#getTmOrderInfo)
@@ -406,6 +407,57 @@
 
 ```
 
+## **<a name="subOtherOrder"> 创建其他订单接口</a>**
+[返回到目录](#menu)
+##### URL
+[/action/tmOrder/springBoard]
+#### 参数格式  `JSON`
+#### HTTP请求方式 `POST`
+#### 渠道执行的类型 actionType：subTmOrder
+
+``` javascript
+   {
+        "actionProcess": "bw",
+        "actionType": "subOtherOrder",
+        "sign": "0E4DF9C01DE69BEB8B8959119F2E4CD7",
+        "isUser": "yes",
+        "actionBody": {
+            "itemCode": "dbsbzc",//产品渠道编码
+            "channelUser": {
+                "channelUserId": "15010929366" //渠道用户唯一标识
+            },
+            "apply": {
+                "orderType": "zzdd",//默认值
+                "contacts": "songyi",// Y 姓名
+                "mobile": "15010929344",// Y 手机号
+                "email": "qq@qq.com",// N 邮箱
+                "notes": "d"// N 备注
+            },
+            "tm": {
+                "totalSum": 1399,// Y  金额
+                "quantity": 1 // Y 数量
+            }
+        }
+    }
+
+```
+
+#### 返回结果
+```javascript
+    {
+        "status": 0,
+        "msg": "success",
+        "data": {
+            "channelItemCode":"zzsbzc",
+            "deliveryOrderNo":"JF202001131450vQbUhS",
+            "orderNo":"TM202001131450WnSmDQ",
+            "channelParams":{}
+        },
+        "requestid": "2016c54abe7249a2a1195d236b333f79"
+    }
+
+```
+
 ## **<a name="subTmOrder"> 商标提报</a>**
 [返回到目录](#menu)
 ##### URL
@@ -498,8 +550,9 @@
         "status": 0,
         "msg": "success",
         "data": {
-            " deliveryOrderNo": "346c3091684e4e57a7639bec30eef5f7",
-            " channelServiceNo": "346c3091684e4e0eef",
+            "channelItemCode":"zzsbzc",
+            "deliveryOrderNo":"JF202001131450vQbUhS",
+            "orderNo":"TM202001131450WnSmDQ",
             "channelParams":{}
         },
         "requestid": "2016c54abe7249a2a1195d236b333f79"