承运与无车承运对接

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

@@ -147,6 +147,18 @@ public class OrderChildSyncTransportListener {
                           SettlementDriverDetail settlementDriverDetail,
                           Integer invoiceType) {
 
+        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
+
+        // 开票服务费
+        settlementOwnerDetail.setInvoiceServiceFee(settlementCommonService.invoiceServiceFeeCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
+        // 开票金额
+        settlementOwnerDetail.setInvoiceFreight(settlementCommonService.invoiceFreightCalc(orderChild.getSettlementWay(),
+                orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail));
+
+        // 结算金额
+        settlementOwnerDetail.setSettlementFreight(settlementCommonService.settlementFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
+
+
         if (Objects.equals(invoiceType, SettlementOwnerEnum.InvoiceType.ONLINE.getCode())) {
             //通过风控
             List<OwnerRunningWaterRecord> runningWaterRecordList = ownerRunningWaterRecordDao.getOwnerRunningWaterRecord(orderChild.getOrderNo());
@@ -199,7 +211,6 @@ public class OrderChildSyncTransportListener {
             settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO.getCode());
         }
 
-        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
 
         if (SettlementOwnerEnum.InvoiceType.ORDINARY.getCode().equals(invoiceType)) {
             if (settlementOwnerDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) == 0) {

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

@@ -231,6 +231,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         if (!Objects.equals(settlementOwnerDetail.getInvoiceChannel(), SettlementOwnerDetailEnum.InvoiceChannel.BROKER.getCode())){
             return;
         }
+        if (settlementOwnerDetail.getInvoiceType() != null) {return;}
 
         try {
             // 获取状态