tj

center-order/app/base/api/api.base.js

@@ -16,14 +16,14 @@ class APIBase {
     async checkAcck(gname, methodname, pobj, query, req) {
         if (methodname.length > 4) {
             var prefixStr = methodname.substr(0, 4);
-            if (prefixStr == "task") {
+            if (prefixStr == "task" || prefixStr == "nbtz") {
                 return system.getResultSuccess();
             }
-        }
+        }//为任务或内部通知的放行
         var method = pobj.actionType;
         if (method && method.length > 4) {
             var prefixStr = method.substr(0, 4);
-            if (prefixStr == "task") {
+            if (prefixStr == "task" || prefixStr == "nbtz") {
                 return system.getResultSuccess();
             }
         }

center-order/app/base/api/impl/notifyaction/internalCallsNotify.js

+var APIBase = require("../../api.base");
+var system = require("../../../system");
+var settings = require("../../../../config/settings");
+class InternalCallsNotify extends APIBase {
+    //内部通知调用
+    constructor() {
+        super();
+        // this.orderinfoSve = system.getObject("service.dbcorder.orderinfoSve");
+    }
+    async updateTmRegistNum(pobj, qobj, req) {
+        return system.getResultSuccess();
+    }
+    async updateTmStatus(pobj, qobj, req) {
+        return system.getResultSuccess();
+    }
+}
+module.exports = InternalCallsNotify;
\ No newline at end of file

center-order/app/base/service/impl/dbcorder/orderinfoSve.js

@@ -494,7 +494,14 @@ class OrderInfoService extends ServiceBase {
         }
       }
     }//修改备注
-    return system.getResultSuccess({ orderStatus: orderItem.orderStatus });
+    var resultParams = { orderStatus: orderItem.orderStatus };
+    if (orderItem.orderStatus < 4) {
+      var orderProductItem = await this.orderproductDao.getItemInfoByOrderNo(actionBody.orderNo);
+      if (orderProductItem) {
+        resultParams.product_info = JSON.parse(orderProductItem.serviceItemSnapshot);
+      }
+    }
+    return system.getResultSuccess(resultParams);
   }
   async updateTmOrder(pobj, actionBody) {//修改商标订单信息
     var orderItem = await this.dao.getItemStatusByOrderNo(actionBody.orderNo, pobj.appInfo.uapp_id);
@@ -574,7 +581,14 @@ class OrderInfoService extends ServiceBase {
       itemResult.data.nclList[dataIndex].nclCount = nclThree.length;
     }
     this.putOrderDelivery(itemResult.data, actionBody.orderNo);
-    return system.getResultSuccess({ orderStatus: orderItem.orderStatus });
+    var resultParams = { orderStatus: orderItem.orderStatus };
+    if (orderItem.orderStatus < 4) {
+      var orderProductItem = await this.orderproductDao.getItemInfoByOrderNo(actionBody.orderNo);
+      if (orderProductItem) {
+        resultParams.product_info = JSON.parse(orderProductItem.serviceItemSnapshot);
+      }
+    }
+    return system.getResultSuccess(resultParams);
   }
 
   putOrderDelivery(data, orderNo) {//修改交付信息

center-order/内部调用通知接口

+1.更新注册号
+1.更新注册号
+请求方式：POST
+地址：notifyaction/internalCallsNotify/updateTmRegistNum
+参数：
+{
+  "tbCode": "TB26202002271337v5y9",//提报号   
+  "tmRegistNum": "",//商标申请号
+ 
+}
+
+2.更新状态和官文
+请求方式：POST
+地址：notifyaction/internalCallsNotify/updateTmStatus
+参数：
+{
+  "tbCode": "TB26202002271337v5y9",//提报号 
+  "tmStatus": "13",//官文状态编码
+  "tmStatusName": "已下发商标注册证",//官文状态名称 
+  "submitTime": "",//提报时间
+  "officialInfo":{//官文信息
+    "tmRegistNum": "29471633",//商标申请号
+	"updated": "2020-02-19T06:53:09.000Z",// 创建时间  
+	"uploadFileName": "29471633-注册-PASSED.pdf",//上传文件名称
+	"returnReceiptUrl": "http://gsb-public.oss-cn-beijing.aliyuncs.com/netsharp_Z7wfENwQZDWiWFbMsSchDkFJKfBb3Ah4.jpg"//官文回执Url  
+  } 
+}