承运与无车承运对接

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

@@ -4,9 +4,11 @@ package com.clx.performance.dao.impl.settle;
 import com.clx.performance.dao.settle.OrderChildSyncTransportRecordDao;
 import com.clx.performance.mapper.settle.OrderChildSyncTransportRecordMapper;
 import com.clx.performance.model.settle.OrderChildSyncTransportRecord;
+import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -19,7 +21,10 @@ public class OrderChildSyncTransportRecordDaoImpl extends BaseDaoImpl<OrderChild
 
     @Override
     public List<OrderChildSyncTransportRecord> selectListForJob() {
-        return baseMapper.selectList(lQrWrapper().eq(OrderChildSyncTransportRecord::getStatus, 0));
+        return baseMapper.selectList(lQrWrapper()
+                .gt(OrderChildSyncTransportRecord::getCreateTime, LocalDateTime.now().minusMonths(3))
+                .eq(OrderChildSyncTransportRecord::getStatus, 0)
+        );
     }
 
     @Override

performance-web/src/main/java/com/clx/performance/extranal/broker/BrokerService.java

@@ -7,5 +7,5 @@ public interface BrokerService {
 
     void orderChildSync(TransportParam param);
 
-    TransportVO getTransportByChildNo(String childNo);
+    TransportVO getOrderChildStatus(String childNo);
 }

performance-web/src/main/java/com/clx/performance/extranal/broker/impl/BrokerServiceImpl.java

@@ -28,7 +28,7 @@ public class BrokerServiceImpl implements BrokerService {
         }
     }
     @Override
-    public TransportVO getTransportByChildNo(String childNo) {
+    public TransportVO getOrderChildStatus(String childNo) {
 
         Result<TransportVO> result = brokerFeign.getTransportByChildNo(childNo, settlementConfig.getBrokerUserCode());
         if (result.getCode() != 0) {

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

@@ -226,10 +226,15 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     @Override
     public void invoiceTypeSync(SettlementInvoiceTypeSyncMqParam mq) {
         OrderChild orderChild = orderChildDao.getByChildNo(mq.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao
+                .getByChildNo(orderChild.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        if (!Objects.equals(settlementOwnerDetail.getInvoiceChannel(), SettlementOwnerDetailEnum.InvoiceChannel.BROKER.getCode())){
+            return;
+        }
 
         try {
             // 获取状态
-            TransportVO result = brokerService.getTransportByChildNo(mq.getChildNo());
+            TransportVO result = brokerService.getOrderChildStatus(mq.getChildNo());
 
             Integer invoiceType;
             if (Objects.equals(result.getRiskStatus(), 1) || Objects.equals(result.getRiskStatus(), 2)) {
@@ -260,8 +265,15 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
 
     @Override
     public void invoiceStatusSync(SettlementInvoiceStatusSyncMqParam mq) {
+        OrderChild orderChild = orderChildDao.getByChildNo(mq.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao
+                .getByChildNo(orderChild.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        if (!Objects.equals(settlementOwnerDetail.getInvoiceChannel(), SettlementOwnerDetailEnum.InvoiceChannel.BROKER.getCode())){
+            return;
+        }
+
         // 获取状态
-        TransportVO result = brokerService.getTransportByChildNo(mq.getChildNo());
+        TransportVO result = brokerService.getOrderChildStatus(mq.getChildNo());
 
         if (Objects.equals(result.getInvoiceStatus(), 1) ) {
             InvoicingStatusNotifyDTO invoicingStatusNotifyDTO = new InvoicingStatusNotifyDTO();
@@ -274,8 +286,15 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
 
     @Override
     public void payStatusSync(SettlementPayStatusSyncMqParam mq) {
+        OrderChild orderChild = orderChildDao.getByChildNo(mq.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao
+                .getByChildNo(orderChild.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        if (!Objects.equals(settlementOwnerDetail.getInvoiceChannel(), SettlementOwnerDetailEnum.InvoiceChannel.BROKER.getCode())){
+            return;
+        }
+
         // 获取状态
-        TransportVO result = brokerService.getTransportByChildNo(mq.getChildNo());
+        TransportVO result = brokerService.getOrderChildStatus(mq.getChildNo());
 
         if (Objects.equals(result.getSettleStatus(), 1) ) {