Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test

performance-web/src/main/java/com/clx/performance/component/OrderChildLoanComponent.java

@@ -249,12 +249,18 @@ public class OrderChildLoanComponent {
 
         if (!Objects.equals(orderInfo.getSupportLoan(), StatusEnum.YES.getCode())){
             log.info("3.2当前运单不支持货主借款");
+
+            //生成提现记录
+            networkDriverRunningWaterRecordService.generateNetworkCaseOutRecord(settlementDriverDetail);
             return;
         }
 
         if (Objects.equals(orderInfo.getPlatformFreightQuotationTaxType(),
                 QuotationEnum.PlatformFreightQuotationTaxType.NO.getCode())){
             log.info("3.3当前运单未税不支持借款");
+
+            //生成提现记录
+            networkDriverRunningWaterRecordService.generateNetworkCaseOutRecord(settlementDriverDetail);
             return;
         }
 

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

@@ -66,6 +66,7 @@ public class OrderChildSyncTransportRecordServiceImpl implements OrderChildSyncT
     @Override
     public void addOrderChildSyncTransportRecord(SettlementDriverDetail detail) {
         OrderChildSyncTransportRecord record = struct.convertRecord(detail);
+        record.setId(null);
         //0：未同步
         record.setStatus(0);
         orderChildSyncTransportRecordDao.saveEntity(record);

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

@@ -202,21 +202,20 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         if (!settlementDriverDetail.getInvoiceType().equals(SettlementOwnerEnum.InvoiceType.ONLINE.getCode())) {
             paySettlementDriver(settlementDriverDetail);
         } else {
-            if (settlementDriverDetail.getPrepayFreightFlag().equals(SettlementDriverEnum.PrepayFreightFlag.PAYED.getCode())
-            && settlementDriverDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) > 0) {
+            if (Objects.equals(orderGoods.getPlatformFreightQuotationTaxType(),
+                    QuotationEnum.PlatformFreightQuotationTaxType.NO.getCode())
+                    && Objects.equals(orderGoods.getSettlementWay(), SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())) {
                 settlementDriverDetail.setSettlementNo(settlementNo);
                 //插入同步网络货运待支付记录
                 childSyncTransportRecordService.addOrderChildSyncTransportRecord(settlementDriverDetail);
             }
-
-            if (Objects.equals(orderGoods.getPlatformFreightQuotationTaxType(),
-                    QuotationEnum.PlatformFreightQuotationTaxType.NO.getCode())
-                    && Objects.equals(orderGoods.getSettlementWay(), SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())) {
+            else if (settlementDriverDetail.getPrepayFreightFlag().equals(SettlementDriverEnum.PrepayFreightFlag.PAYED.getCode())
+            && settlementDriverDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) > 0) {
                 settlementDriverDetail.setSettlementNo(settlementNo);
                 //插入同步网络货运待支付记录
                 childSyncTransportRecordService.addOrderChildSyncTransportRecord(settlementDriverDetail);
             }
- 
+
         }
 
         // 更新结算单