Merge remote-tracking branch 'refs/remotes/origin/master' into v18.5_pound_list_ocr_20240701

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

@@ -111,8 +111,9 @@ public class OrderChildLoanComponent {
         OwnerQuotationDetailVO quotationDetailVO = orderFeign.getQuotationByOrderNo(orderInfoVO.getOrderNo()).getData();
         BigDecimal freightFreezeRate = quotationDetailVO.getFreightFreezeRate();
 
-        if (freightFreezeRate.compareTo(new BigDecimal(100)) == 0) {
-            //百分百预付不需要考虑借款账户
+        if (freightFreezeRate.compareTo(new BigDecimal(100)) == 0
+                || !Objects.equals(orderGoods.getPlatformFreightQuotationTaxType(),QuotationEnum.PlatformFreightQuotationTaxType.YES.getCode())) {
+            //百分百预付不需要考虑借款账户或者平台运费报价税类型为未税
             log.info("2.百分百预付不需要考虑借款账户");
             return;
         }

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

@@ -30,10 +30,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * 货单最晚接单时间、最晚到达货源地时间处理
@@ -121,6 +118,9 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                     continue;
                 }
                 OrderGoods orderGoods = optional.get();
+//                if(Objects.equals(orderGoods.getOrderGoodsStatus(),OrderGoodsStatusEnum.Status.CANCEL.getCode())){
+//                    continue;
+//                }
 
                 if (orderGoods.getResidueTransportWeight().compareTo(BigDecimal.ZERO) == 0) {
                     List<OrderChild> orderChildren = orderChildDao.selectInTransitOrderChildByOrderGoodsNo(orderGoodsNo);