gMerge branch 'center-channel' of gitlab.gongsibao.com:jiangyong/zhichan into center-channel

center-channel/app/base/service/impl/common/centerorderSve.js

@@ -161,6 +161,9 @@ class CenterorderService {
     }
     var orderrtn = await this.utilsOrderSve.addOrder(pobj, pobj.actionBody);
    if (orderrtn.status != 0) {
+     if(orderrtn.status==-1){
+      return system.getResultSuccess(null, "订单已经创建");
+     }
       return system.getResultFail(-5012, "订单创建失败");
     }
     if (orderrtn.data) {
@@ -185,6 +188,7 @@ class CenterorderService {
       pobj.actionBody.needId = solutiondata.data.channelNeedNo;
     }
     if (solutiondata.status == 0) {
+      pobj.actionBody.orderNo=pobj.actionBody.channelOrder.channelOrderNo;
       this.utilsPushSve.aliBusiness2Fq(pobj, "pushOrderBusiness");
     }
     return system.getResultSuccess();