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

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

@@ -25,20 +25,21 @@ public class NetworkSyncComponent {
 
     public void ownerSettlementSync(SettlementOwner settlementOwner, List<SettlementOwnerDetail> settlementOwnerDetailList){
         //TODO 通知网络货运做货主计费开票标识通知
-        OwnerSettlementSyncParam param = new OwnerSettlementSyncParam();
-        String mobile = ownerFeign.getOwnerInfo(settlementOwner.getOwnerUserNo()).getData().getMobile();
-        param.setOwnerMobile(mobile);
-        List<OwnerSettlementSyncParam.SettlementItem> settlementList = new LinkedList<>();
-        for (SettlementOwnerDetail settlementOwnerDetail : settlementOwnerDetailList) {
-            String childNo = settlementOwnerDetail.getChildNo();
-            OwnerSettlementSyncParam.SettlementItem  item = new OwnerSettlementSyncParam.SettlementItem();
-            item.setChildNo(childNo);
-            item.setSettlementNo(settlementOwnerDetail.getSettlementNo());
-            settlementList.add(item);
-        }
-        param.setSettlementList(settlementList);
-        HttpDTO httpDTO = transportFeignService.ownerSettlementSync(param);
-        String decrypt = ThirdComponent.decrypt(httpDTO.getData());
-        log.info("通知网络货运做货主计费开票标识通知请求解密后：{}", decrypt);
+        // 禁用网络货运同步
+//        OwnerSettlementSyncParam param = new OwnerSettlementSyncParam();
+//        String mobile = ownerFeign.getOwnerInfo(settlementOwner.getOwnerUserNo()).getData().getMobile();
+//        param.setOwnerMobile(mobile);
+//        List<OwnerSettlementSyncParam.SettlementItem> settlementList = new LinkedList<>();
+//        for (SettlementOwnerDetail settlementOwnerDetail : settlementOwnerDetailList) {
+//            String childNo = settlementOwnerDetail.getChildNo();
+//            OwnerSettlementSyncParam.SettlementItem  item = new OwnerSettlementSyncParam.SettlementItem();
+//            item.setChildNo(childNo);
+//            item.setSettlementNo(settlementOwnerDetail.getSettlementNo());
+//            settlementList.add(item);
+//        }
+//        param.setSettlementList(settlementList);
+//        HttpDTO httpDTO = transportFeignService.ownerSettlementSync(param);
+//        String decrypt = ThirdComponent.decrypt(httpDTO.getData());
+//        log.info("通知网络货运做货主计费开票标识通知请求解密后：{}", decrypt);
     }
 }

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/job/OrderChildPaySyncTransportJob.java

@@ -49,7 +49,7 @@ public class OrderChildPaySyncTransportJob {
     private final OrderGoodsDao orderGoodsDao;
 
     /**
-     * 同步网络货运
+     * 同步网络货运运单支付(禁用网络货运同步)
      */
 //    @XxlJob("orderChildPaySyncTransportJob")
     public void orderChildPaySyncTransportJob() {

performance-web/src/main/java/com/clx/performance/job/OrderChildSyncTransportInvoiceExceptionJob.java

@@ -49,7 +49,7 @@ public class OrderChildSyncTransportInvoiceExceptionJob {
 
     private final SettlementDriverDetailDao settlementDriverDetailDao;
     /**
-     * 同步网络货运（禁用）
+     * 同步网络货运（禁用网络货运同步）
      */
 //    @XxlJob("orderChildSyncTransportInvoiceExceptionJob")
     @Transactional(rollbackFor = Exception.class)

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

@@ -26,13 +26,12 @@ import com.clx.performance.model.*;
 import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.service.TransportSyncService;
-import com.clx.performance.service.broker.OrderChildSyncBrokerService;
+import com.clx.performance.service.broker.OrderChildBrokerService;
 import com.clx.performance.service.settle.NetworkDriverRunningWaterRecordService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Component;
 
@@ -72,7 +71,7 @@ public class OrderChildSyncTransportListener {
     private final ApplicationEventPublisher applicationEventPublisher;
     private final InvoicingCompanyService invoicingCompanyService;
     private final SettlementConfig settlementConfig;
-    private final OrderChildSyncBrokerService orderChildSyncBrokerService;
+    private final OrderChildBrokerService orderChildBrokerService;
     private final  OrderChildDao orderChildDao;
     /**
      * 承运同步网络货运运单
@@ -105,13 +104,7 @@ public class OrderChildSyncTransportListener {
         SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao.getByChildNo(orderChild.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.getByChildNo(orderChild.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
-//        // 开票服务费
-//        settlementOwnerDetail.setInvoiceServiceFee(invoiceServiceFeeCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
-//        // 开票金额
-//        settlementOwnerDetail.setInvoiceFreight(invoiceFreightCalc(orderChild.getSettlementWay(),
-//                orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail));
-
-//        // 同步网络货运
+//        // 同步网络货运(禁用网络货运同步)
 //        ThirdOrderChildBrokerParam param = transportSyncService.generateOrderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
 //        HttpDTO httpDTOResult = transportFeignService.orderChildSync(param);
 //        String decrypt = ThirdComponent.decrypt(httpDTOResult.getData());
@@ -119,7 +112,7 @@ public class OrderChildSyncTransportListener {
 //        extracted(orderChild, bean, JSONUtil.parse(bean).toString(), settlementOwnerDetail, invoiceType, settlementDriverDetail);
 
         // 同步broker
-        orderChildSyncBrokerService.orderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
+        orderChildBrokerService.orderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
     }
 
     public void extracted(OrderChild orderChild, OrderChildSyncDTO bean, String remark,

performance-web/src/main/java/com/clx/performance/service/broker/OrderChildSyncBrokerService.java → performance-web/src/main/java/com/clx/performance/service/broker/OrderChildBrokerService.java

@@ -5,7 +5,7 @@ import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 
-public interface OrderChildSyncBrokerService {
+public interface OrderChildBrokerService {
 
     void orderChildSync(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,
                         SettlementDriverDetail settlementDriverDetail);

performance-web/src/main/java/com/clx/performance/service/impl/broker/OrderChildSyncBroker.java → performance-web/src/main/java/com/clx/performance/service/impl/broker/OrderChildBrokerServiceImpl.java

@@ -13,7 +13,7 @@ import com.clx.performance.model.OrderChildImage;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
-import com.clx.performance.service.broker.OrderChildSyncBrokerService;
+import com.clx.performance.service.broker.OrderChildBrokerService;
 import com.clx.performance.vo.pc.broker.*;
 import com.clx.user.feign.DocumentFeign;
 import com.clx.user.feign.DriverFeign;
@@ -31,7 +31,7 @@ import java.util.List;
 
 @Slf4j
 @Service
-public class OrderChildSyncBroker implements OrderChildSyncBrokerService {
+public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
 
     @Autowired
     private BrokerService brokerService;

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) ) {