承运与无车承运对接

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

@@ -90,19 +90,9 @@ public class OrderChildSyncTransportListener {
 
             transportOrderChildProcess(orderChildBase);
 
-            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));
 
-            OrderChildSyncTransportInvoiceRecord entity = new OrderChildSyncTransportInvoiceRecord();
-            entity.setChildNo(orderChild.getChildNo());
-            entity.setType(TransportSyncTypeEnum.Type.EXCEPTION.getCode());
-            entity.setRemark(e.getMessage());
-            orderChildSyncTransportInvoiceRecordDao.saveEntity(entity);
         }
     }
 
@@ -127,8 +117,24 @@ public class OrderChildSyncTransportListener {
         }
         else{
 
+            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));
+
+                OrderChildSyncTransportInvoiceRecord entity = new OrderChildSyncTransportInvoiceRecord();
+                entity.setChildNo(orderChild.getChildNo());
+                entity.setType(TransportSyncTypeEnum.Type.EXCEPTION.getCode());
+                entity.setRemark(e.getMessage());
+                orderChildSyncTransportInvoiceRecordDao.saveEntity(entity);
+            }
         }
 
     }
@@ -149,11 +155,11 @@ public class OrderChildSyncTransportListener {
 
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
 
-        // 开票服务费
-        settlementOwnerDetail.setInvoiceServiceFee(settlementCommonService.invoiceServiceFeeCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
-        // 开票金额
-        settlementOwnerDetail.setInvoiceFreight(settlementCommonService.invoiceFreightCalc(orderChild.getSettlementWay(),
-                orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail));
+//        // 开票服务费
+//        settlementOwnerDetail.setInvoiceServiceFee(settlementCommonService.invoiceServiceFeeCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
+//        // 开票金额
+//        settlementOwnerDetail.setInvoiceFreight(settlementCommonService.invoiceFreightCalc(orderChild.getSettlementWay(),
+//                orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail));
 
         // 结算金额
         settlementOwnerDetail.setSettlementFreight(settlementCommonService.settlementFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));

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

@@ -86,6 +86,9 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         // 预付运费
         settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
 
+        //借款抵扣金额初始化
+        settlementOwnerDetail.setLoanFreight(BigDecimal.ZERO);
+
         // 开票服务费
         settlementOwnerDetail.setInvoiceServiceFeeRate(
                 orderGoods.getInvoiceServiceFeeRate()==null? BigDecimal.ZERO : orderGoods.getInvoiceServiceFeeRate());
@@ -98,12 +101,9 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
                 settlementCommonService.invoiceFreightCalc(orderChild.getSettlementWay(),
                 orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail));
 
-        // 结算金额
-        settlementOwnerDetail.setSettlementFreight(
-                settlementCommonService.settlementFreightCalc(orderGoods.getSettlementWay(),settlementOwnerDetail));
-
-        //借款抵扣金额初始化
-        settlementOwnerDetail.setLoanFreight(BigDecimal.ZERO);
+//        // 结算金额
+//        settlementOwnerDetail.setSettlementFreight(
+//                settlementCommonService.settlementFreightCalc(orderGoods.getSettlementWay(),settlementOwnerDetail));
 
         settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO.getCode());
         //设置开票公司信息