承运与无车承运对接

performance-web/src/main/java/com/clx/performance/listener/OrderChildSyncTransportListener.java

@@ -120,21 +120,17 @@ public class OrderChildSyncTransportListener {
             try{
                 // 同步broker
                 orderChildBrokerService.orderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
-
-                OrderChildSyncTransportInvoiceRecord entity = new OrderChildSyncTransportInvoiceRecord();
-                entity.setChildNo(orderChild.getChildNo());
-                entity.setType(TransportSyncTypeEnum.Type.RESULT.getCode());
-                entity.setRemark("异步查询状态");
-                orderChildSyncTransportInvoiceRecordDao.saveEntity(entity);
             } catch (Exception e) {
                 log.info("当前OrderChildSyncTransportListener监听同步网络货运失败,运单号{}, 错误信息{}", orderChild.getChildNo(), ExceptionUtils.getStackTrace(e));
 
+            } finally {
                 OrderChildSyncTransportInvoiceRecord entity = new OrderChildSyncTransportInvoiceRecord();
                 entity.setChildNo(orderChild.getChildNo());
-                entity.setType(TransportSyncTypeEnum.Type.EXCEPTION.getCode());
-                entity.setRemark(e.getMessage());
+                entity.setType(TransportSyncTypeEnum.Type.RESULT.getCode());
+                entity.setRemark("异步查询状态");
                 orderChildSyncTransportInvoiceRecordDao.saveEntity(entity);
             }
+
         }
 
     }

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java

@@ -248,10 +248,10 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
 
             String remark = "";
             Integer invoiceType = SettlementOwnerEnum.InvoiceType.ONLINE.getCode();
-            if (Objects.equals(result.getRiskStatus(), 1) || Objects.equals(result.getRiskStatus(), 2)) {
-                invoiceType = SettlementOwnerEnum.InvoiceType.ORDINARY.getCode();
-                remark += result.getRiskReason();
-            }
+//            if (Objects.equals(result.getRiskStatus(), 1) || Objects.equals(result.getRiskStatus(), 2)) {
+//                invoiceType = SettlementOwnerEnum.InvoiceType.ORDINARY.getCode();
+//                remark += result.getRiskReason();
+//            }
 
             if (Objects.equals(result.getSyncStatus(), 2)) {
                 invoiceType = SettlementOwnerEnum.InvoiceType.ORDINARY.getCode();