tj

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

@@ -26,6 +26,9 @@ class ProductAPI extends WEBBase {
         pobj.requestId = req.requestId;
         pobj.requestId = req.requestId;
         var opResult = null;
         var opResult = null;
         switch (action_type) {
         switch (action_type) {
+            case "closeAliTrademarkApplication"://关闭阿里自主申请
+                opResult = await this.utilsOpOrderSve.updateContacts(pobj, pobj.actionBody);
+                break;
             case "updateContacts"://修改订单联系人
             case "updateContacts"://修改订单联系人
                 opResult = await this.utilsOpOrderSve.updateContacts(pobj, pobj.actionBody);
                 opResult = await this.utilsOpOrderSve.updateContacts(pobj, pobj.actionBody);
                 break;
                 break;
@@ -33,7 +36,7 @@ class ProductAPI extends WEBBase {
                 opResult = await this.utilsOpOrderSve.updateTmOrder(pobj, pobj.actionBody);
                 opResult = await this.utilsOpOrderSve.updateTmOrder(pobj, pobj.actionBody);
                 break;
                 break;
             case "tmConfirm"://商标方案确认
             case "tmConfirm"://商标方案确认
-                opResult = await this.utilsOpOrderSve.tmConfirm(pobj,pobj.actionBody);
+                opResult = await this.utilsOpOrderSve.tmConfirm(pobj, pobj.actionBody);
                 break;
                 break;
             default:
             default:
                 opResult = system.getResult(null, "action_type参数错误");
                 opResult = system.getResult(null, "action_type参数错误");

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

@@ -9,6 +9,17 @@ class UtilsOpOrderService extends AppServiceBase {
     this.centerOrderUrl = settings.centerOrderUrl();
     this.centerOrderUrl = settings.centerOrderUrl();
     this.utilsPushSve = system.getObject("service.utilsSve.utilsPushSve");
     this.utilsPushSve = system.getObject("service.utilsSve.utilsPushSve");
   }
   }
+  async getProductInterface(appInfo, product_id) {//获取产品调用接口
+    //获取推送接口信息
+    var getProductInterfaceUrl = settings.centerAppUrl() + "action/opProduct/springBoard";
+    var getProductInterfaceObj = {
+      "actionType": "getProductInterface",
+      "appInfo": appInfo,
+      "actionBody": { "product_id": product_id }
+    };
+    var productItemInterfaceResult = await this.restPostUrl(getProductInterfaceObj, getProductInterfaceUrl);
+    return productItemInterfaceResult;
+  }
   async updateContacts(pobj, actionBody) {
   async updateContacts(pobj, actionBody) {
     if (!actionBody.orderNo) {
     if (!actionBody.orderNo) {
       return system.getResult(null, "actionBody.orderNo can not be empty，100310");
       return system.getResult(null, "actionBody.orderNo can not be empty，100310");
@@ -93,16 +104,12 @@ class UtilsOpOrderService extends AppServiceBase {
       }
       }
       tmpPobj.actionBody.product_info = productItemResult.data;
       tmpPobj.actionBody.product_info = productItemResult.data;
       tmpPobj.actionBody.product_id = tmpPobj.actionBody.product_info.id;
       tmpPobj.actionBody.product_id = tmpPobj.actionBody.product_info.id;
-      //获取推送接口信息
-      var getProductInterfaceUrl = settings.centerAppUrl() + "action/opProduct/springBoard";
-      var getProductInterfaceObj = {
-        "actionType": "getProductInterface",
-        "appInfo": pobj.appInfo,
-        "actionBody": { "product_id": tmpPobj.actionBody.product_id }
-      };
-      var productItemInterfaceResult = await this.restPostUrl(getProductInterfaceObj, getProductInterfaceUrl);
-      tmpPobj.actionBody.product_info.interface_info = productItemInterfaceResult.data;
-      this.utilsPushSve.pushBusInfo(tmpPobj, "pushOpSolution", 1);
+      //获取推送接口并推送
+      var pushINterfaceResult = await this.getProductInterface(pobj.appInfo, tmpPobj.actionBody.product_id);
+      if (pushINterfaceResult.status == 0) {
+        tmpPobj.actionBody.product_info.interface_info = pushINterfaceResult.data;
+        this.utilsPushSve.pushBusInfo(tmpPobj, "pushOpSolution", 1);
+      }
     }
     }
   }
   }
 }
 }