商标驳回复审推送

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

@@ -5,9 +5,8 @@ class utilsDeliverSve extends AppServiceBase{
     constructor() {
         super();
         this.centerOrderUrl = settings.centerOrderUrl();
-        this.centerAppUrl = settings.centerAppUrl();
         this.fileDealUrl = settings.fileDealUrl();
-        this.utilsDeliverSystemSve = system.getObject("service.utilsSve.utilsDeliverSystemSve")
+        this.utilsPushSve = system.getObject("service.utilsSve.utilsPushSve");
     }
 
     /**
@@ -15,11 +14,18 @@ class utilsDeliverSve extends AppServiceBase{
      * @param pobj
      * @returns {Promise<*>}
      */
-    async pushDeliver(pobj){
-        var verifyResult = await this.verifyParam(pobj);
-        pobj.actionBody = verifyResult.data;
-        var result = await this.utilsDeliverSystemSve.pushBusiness2DeliverSystem(pobj);
-        return result;
+    async pushTmReDeliver(pobj){
+        try{
+            var verifyResult = await this.verifyParam(pobj);
+            if(verifyResult.status !=0){
+                return system.getResultFail();
+            }
+            pobj.actionBody = verifyResult.data;
+            this.utilsPushSve.aliBusiness2Delivery(pobj, "pushTmReDeliver");
+            return system.getResultSuccess();
+        }catch (e) {
+            return system.getResultFail();
+        }
     }
 
 
@@ -95,41 +101,36 @@ class utilsDeliverSve extends AppServiceBase{
      */
     async addReviewList(pobj,actionBody){
         //参数重组
-        let verifyResult = await this.verifyParam(pobj.actionBody);
-        if (verifyResult.status != 0) {
-            return await this.disposePushResultFail(pobj, verifyResult, "delivery->pushDelivery->verifyResult", "");
-        }
-        //修改交付信息
-        let url = this.centerOrderUrl +"action/tmreview/springBoard";
+        try{
+            let verifyResult = await this.verifyParam(pobj.actionBody);
+            if (verifyResult.status != 0) {
+                return await this.disposePushResultFail(pobj, verifyResult, "delivery->pushDelivery->verifyResult", "");
+            }
+            //修改交付信息
+            let url = this.centerOrderUrl +"action/tmreview/springBoard";
 
-        let result = await this.restPostUrl(pobj, url);
-        if(result.status !==0){
-            return system.getResult(null,'更新失败')
-        }
-        //获取订单
-        let orderUrl = this.centerOrderUrl + "action/order/springBoard";
-        pobj.actionType = "getOrderDetails"
-        let orderResult = await this.restPostUrl(pobj,orderUrl);
-        if(orderResult.status!=0){
-            return system.getResult(null,orderResult.msg);
-        }
-        //支付成功推送到交付中心
-        if(orderResult.data && orderResult.data.orderStatus === 2){
-            // 推送交付中心
-            pobj.actionBody = verifyResult.data;
-            let appUrl = this.centerAppUrl + 'action/opProduct/springBoard';
-            let params = {
-                actionType:"getAppInterface",
-                actionBody:pobj.actionBody
+            let result = await this.restPostUrl(pobj, url);
+            if(result.status !==0){
+                return system.getResult(null,'更新失败')
             }
-            let reveResult = await this.restPostUrl(params,appUrl);
-            if(reveResult.status !=0){
-                return system.getResult(null,'获取接口数据失败');
+            //获取订单
+            let orderUrl = this.centerOrderUrl + "action/order/springBoard";
+            pobj.actionType = "getOrderDetails"
+            let orderResult = await this.restPostUrl(pobj,orderUrl);
+            if(orderResult.status!=0){
+                return system.getResult(null,orderResult.msg);
             }
-            pobj.interface_info = reveResult.data;
-            result = await this.utilsDeliverSystemSve.pushBusiness2DeliverSystem(pobj);
+            //支付成功推送到交付中心
+            if(orderResult.data && orderResult.data.orderStatus === 2){
+                // 推送交付中心
+                pobj.actionBody = verifyResult.data;
+                this.utilsPushSve.aliBusiness2Delivery(pobj, "pushTmReDeliver");
+            }
+            return result;
+        }catch (e) {
+            return system.getResultFail(-1,e)
         }
-        return result;
+
     }
 
     /**