推送IC订单

center-channel/app/base/service/app.base.js

@@ -242,7 +242,7 @@ class AppServiceBase {
       returnType: '1',
       opTitle: opType + "数据推送成功->" + opTitleDesc
     });
-    result.data = null;
+    // result.data = null;
     return result;
   }
   /**

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

@@ -82,7 +82,7 @@ class UtilsFqAliyunService extends AppServiceBase {
     try {
       var rc = system.getObject("util.aliyunClient");
       var rtn = await rc.post(url, key, secret, params);
-      if (rtn.code != 200 || rtn.success != true) {
+      if (rtn.code != 200 && rtn.success != true) {
         return system.getResult(null, "推送失败，失败原因：" + rtn.errorMsg + "，selfrequestId=" + pobj.requestId + "，requestId=" + rtn.requestId);
       }
       return system.getResultSuccess(null, "推送成功");
@@ -100,6 +100,31 @@ class UtilsFqAliyunService extends AppServiceBase {
       return system.getResult(null, "推送操作异常->fq->opAliyunClientPost->error：" + e.stack);
     }
   }
+
+  async opICClientPost(pobj, url, key, secret, params) {
+    try {
+      var rc = system.getObject("util.aliyunClient");
+      var rtn = await rc.post(url, key, secret, params);
+      if (rtn.code != 200 || rtn.success != true) {
+        return system.getResult(null, "推送失败，失败原因：" + rtn.errorMsg + "，selfrequestId=" + pobj.requestId + "，requestId=" + rtn.requestId);
+      }
+      return system.getResultSuccess(rtn.data, "推送成功");
+    } catch (e) {
+      //日志记录
+      this.logCtl.error({
+        appid: pobj.appInfo ? pobj.appInfo.uapp_id || "" : "",
+        appkey: pobj.appInfo ? pobj.appInfo.uapp_key || "" : "",
+        requestId: pobj.requestId || "",
+        op: "service/impl/utilsSve/opAliyunClientPost.js/opAliyunClientPost",
+        content: "error：" + e.stack,
+        // clientIp: pobj.clientIp,
+        optitle: pobj.opType + "推送操作异常->fq->opAliyunClientPost",
+      });
+      return system.getResult(null, "推送操作异常->fq->opAliyunClientPost->error：" + e.stack);
+    }
+  }
+
+
   async verifyParam(pobj) {//参数信息验证
     var verify = system.getResultSuccess();
     if (!pobj.interface_params) {
@@ -144,7 +169,7 @@ class UtilsFqAliyunService extends AppServiceBase {
       "product_item":pobj.actionBody.product_item
     }
     pobj.params = icOrderParams;
-    var result = await this.opAliyunClientPost(pobj, interface_params_info.opUrl, interface_params_info.key, interface_params_info.secret, icOrderParams);
+    var result = await this.opICClientPost(pobj, interface_params_info.opUrl, interface_params_info.key, interface_params_info.secret, icOrderParams);
     return await this.disposePushResult(pobj, result, "fq->pushOrder2IC->result", this.pushlogFailType.FQ);
   }
 

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

@@ -1192,16 +1192,20 @@ class UtilsOrderService extends AppServiceBase {
       return icOrderResult;
     }
     let ids = icOrderResult.data.orderList;
-    let orderServiceNo = this.getBusUid("CN");
+    let orderServiceNo = await this.getBusUid("CN");
+    pobj.actionType = 'updateOrder';
     let orderUrl = settings.centerOrderUrl() +'action/order/springBoard';
+    let result = [];
     for(let i =0;i<ids.length;i++){
       let orderNo = ids[i].idempotentId;
       let contractNo = ids[i].contractNo;
+      result.push(ids[i].orderNo)
       actionBody.orderNo = orderNo;
       actionBody.contractNo = contractNo;
       actionBody.orderServiceNo = orderServiceNo;
       this.restPostUrl(orderUrl,pobj);
     }
+    return system.getResultSuccess(result)
   }
 }
 module.exports = UtilsOrderService;