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

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementOwnerDetailVO.java

@@ -70,6 +70,11 @@ public class CarrierPageSettlementOwnerDetailVO {
     @ApiModelProperty(value = "开票标识：1网运单 2普通单")
     private Integer invoiceType;
     @MoneyOutConvert
+    @ApiModelProperty(value = "开票服务费")
+    private BigDecimal invoiceServiceFee;
+    @ApiModelProperty(value = "开票服务率")
+    private BigDecimal invoiceServiceFeeRate;
+    @MoneyOutConvert
     @ApiModelProperty(value = "借款抵扣金额")
     private BigDecimal loanFreight;
     @ApiModelProperty("结算方式  1装车净重 2卸车净重")

performance-web/src/main/java/com/clx/performance/dao/OrderChildSyncTransportInvoiceRecordDao.java

@@ -14,4 +14,5 @@ import java.util.List;
 public interface OrderChildSyncTransportInvoiceRecordDao extends BaseDao<OrderChildSyncTransportInvoiceRecordMapper, OrderChildSyncTransportInvoiceRecord, Integer> {
 
     List<OrderChildSyncTransportInvoiceRecord> selectListForJob();
+    List<OrderChildSyncTransportInvoiceRecord> selectListForJobOfFirst();
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildSyncTransportInvoiceRecordDaoImpl.java

 package com.clx.performance.dao.impl;
 
 import com.clx.performance.dao.OrderChildSyncTransportInvoiceRecordDao;
+import com.clx.performance.enums.TransportSyncTypeEnum;
 import com.clx.performance.mapper.OrderChildSyncTransportInvoiceRecordMapper;
 import com.clx.performance.model.OrderChildSyncTransportInvoiceRecord;
 import com.msl.common.dao.impl.BaseDaoImpl;
@@ -23,4 +24,12 @@ public class OrderChildSyncTransportInvoiceRecordDaoImpl extends BaseDaoImpl<Ord
                 .le(OrderChildSyncTransportInvoiceRecord::getCreateTime, LocalDateTime.now().minusMinutes(10))
         );
     }
+
+    @Override
+    public List<OrderChildSyncTransportInvoiceRecord> selectListForJobOfFirst() {
+        return list(lUdWrapper()
+                .eq(OrderChildSyncTransportInvoiceRecord::getType, TransportSyncTypeEnum.Type.RESULT.getCode())
+                .le(OrderChildSyncTransportInvoiceRecord::getCreateTime, LocalDateTime.now().minusMinutes(3))
+        );
+    }
 }

performance-web/src/main/java/com/clx/performance/job/settlement/SettlementJob.java

@@ -33,8 +33,14 @@ public class SettlementJob {
      */
     @XxlJob("settlementInvoiceTypeSync")
     public void settlementInvoiceTypeSync() {
+        // 首次
         List<OrderChildSyncTransportInvoiceRecord> recordList = orderChildSyncTransportInvoiceRecordDao
+                .selectListForJobOfFirst();
+        // 异常
+        List<OrderChildSyncTransportInvoiceRecord> recordList1 = orderChildSyncTransportInvoiceRecordDao
                 .selectListForJob();
+        recordList.addAll(recordList1);
+
         log.info("待同步无车承运运单状态，size:{}", recordList.size());
         if (recordList.isEmpty()) {return;}