Merge branch 'refs/heads/v20.9_settlement_20240805' into test

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

@@ -130,12 +130,16 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
     }
 
     @Override
-    public boolean updateInvoiceCompany(List<Integer> idList, Integer companyId, String companyShorterName, String companyGroupCode) {
+    public boolean updateInvoiceCompany(List<Integer> idList, Integer companyId,
+                                        String companyShorterName, String companyGroupCode,
+                                        String invoicingCompanyModifiedBy, LocalDateTime invoicingCompanyModifiedTime) {
         return update(lUdWrapper()
                 .in(SettlementOwnerDetail::getId, idList)
                 .set(SettlementOwnerDetail::getInvoicingCompanyId, companyId)
                 .set(SettlementOwnerDetail::getInvoicingCompanyShorterName, companyShorterName)
                 .set(SettlementOwnerDetail::getInvoicingCompanyGroupCode, companyGroupCode)
+                .set(SettlementOwnerDetail::getInvoicingCompanyModifiedBy, invoicingCompanyModifiedBy)
+                .set(SettlementOwnerDetail::getInvoicingCompanyModifiedTime, invoicingCompanyModifiedTime)
         );
     }
 

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

@@ -12,6 +12,7 @@ import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 
@@ -36,7 +37,9 @@ public interface SettlementOwnerDetailDao extends BaseDao<SettlementOwnerDetailM
 
     boolean updateFinalPaymentStatusBySettlementNo(@Param("settlementNo")String settlementNo, @Param("finalPaymentStatus")Integer finalPaymentStatus);
 
-    boolean updateInvoiceCompany(List<Integer> idList, Integer companyId, String companyShorterName, String companyGroupCode);
+    boolean updateInvoiceCompany(List<Integer> idList, Integer companyId,
+                                 String companyShorterName, String companyGroupCode,
+                                 String invoicingCompanyModifiedBy, LocalDateTime invoicingCompanyModifiedTime);
 
 
     Optional<SettlementOwnerDetail> findById(Integer id);

performance-web/src/main/java/com/clx/performance/service/impl/broker/OrderChildBrokerMqHandlerServiceImpl.java

@@ -11,6 +11,7 @@ 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.OrderChildBrokerMqHandlerService;
+import com.clx.performance.service.broker.OrderChildBrokerMqService;
 import com.clx.performance.service.broker.OrderChildBrokerService;
 import com.clx.performance.vo.mq.broker.BrokerOrderChildSyncMqParam;
 import com.clx.performance.vo.mq.broker.BrokerOrderChildUpdateMqParam;
@@ -19,11 +20,14 @@ import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.Objects;
 
 @Slf4j
 @Service
 public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqHandlerService {
+
+    private static final Integer DELAY_TIME = 20;
     @Autowired
     private OrderGoodsDao orderGoodsDao;
     @Autowired
@@ -34,6 +38,8 @@ public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqH
     private SettlementDriverDetailDao settlementDriverDetailDao;
     @Autowired
     private OrderChildBrokerService orderChildBrokerService;
+    @Autowired
+    private OrderChildBrokerMqService orderChildBrokerMqService;
 
     @Override
     public void orderChildSync(BrokerOrderChildSyncMqParam mq) {
@@ -81,6 +87,13 @@ public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqH
             return;
         }
 
+        // 延迟推送
+        if (settlementOwnerDetail.getCreateTime().isAfter(LocalDateTime.now().minusSeconds(DELAY_TIME))){
+            // 发送mq (运单更新)
+            orderChildBrokerMqService.orderChildUpdate(childNo);
+            return;
+        }
+
         try{
             // 更新broker
             orderChildBrokerService.orderChildUpdate(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);

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

@@ -52,6 +52,8 @@ import java.util.stream.Collectors;
 
 import com.msl.common.result.Result;
 import com.msl.document.api.feign.FileUploadFeign;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -173,6 +175,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void updateInvoiceCompany(CarrierSettlementOwnerDetailCompanyUpdateParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
 
         List<SettlementOwnerDetail> list = settlementOwnerDetailDao.findListByIdList(param.getIdList());
         for (SettlementOwnerDetail item : list) {
@@ -182,7 +185,8 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         }
 
         settlementOwnerDetailDao.updateInvoiceCompany(param.getIdList(), param.getCompanyId(),
-                param.getCompanyShorterName(), param.getCompanyGroupCode());
+                param.getCompanyShorterName(), param.getCompanyGroupCode(),
+                loginUserInfo.getUserName(), LocalDateTime.now());
 
         // 更新开票公司
         settlementPostService.updateInvoiceCompany(list);