Merge branch 'refs/heads/v30.6_order_quote_20241022' into dev_jdk17

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

@@ -498,9 +498,9 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setOrderNo(orderGoods.getOrderNo());
         orderChild.setOrderGoodsNo(orderGoods.getOrderGoodsNo());
         orderChild.setFreightPrice(orderGoods.getPendingOrderFreight());
-        orderChild.setForecastFreightPrice(orderGoods.getForecastOrderFreight());
+        orderChild.setForecastFreightPrice(orderInfo.getValidFreightPrice());
         orderChild.setLossPrice(orderGoods.getLossPrice());
-        orderChild.setOrderFreightPrice(orderInfo.getValidFreightPrice());
+        orderChild.setOrderFreightPrice(orderInfo.getValidForecastFreightQuotation());
 
         orderChild.setGoodsId(orderGoods.getGoodsId());
         orderChild.setGoodsName(orderGoods.getGoodsName());

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

@@ -1108,16 +1108,12 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         if (Objects.equals(feignOrderVO.getPlatformFreightQuotationTaxType(),
                 InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
 
-            if (Objects.equals(settlementDriverDetail.getInvoiceConfigType(),
-                    InvoicingCompanyEnum.YesAndNo.YES.getCode())) {
+            // 查询开票公司
+            InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompany(
+                    settlementOwnerDetail.getInvoicingCompanyId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
-                // 查询开票公司
-                InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompany(
-                        settlementOwnerDetail.getInvoicingCompanyId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-
-                settlementOwnerDetail.setInvoiceServiceFeeRate(
-                        invoiceCompany.getServiceFeeRate() == null ? BigDecimal.ZERO : invoiceCompany.getServiceFeeRate());
-            }
+            settlementOwnerDetail.setInvoiceServiceFeeRate(
+                    invoiceCompany.getServiceFeeRate() == null ? BigDecimal.ZERO : invoiceCompany.getServiceFeeRate());
         }
 
         // 开票服务费

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

@@ -163,20 +163,17 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
             if (Objects.equals(feignOrderVO.getPlatformFreightQuotationTaxType(),
                     InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
 
-                if (Objects.equals(settlementOwnerDetail.getInvoiceConfigType(), InvoicingCompanyEnum.YesAndNo.YES.getCode())) {
+                //设置开票公司信息
+                settlementOwnerDetail.setInvoicingCompanyId(orderChild.getInvoicingCompanyId());
+                settlementOwnerDetail.setInvoicingCompanyShorterName(orderChild.getInvoicingCompanyShorterName());
+                settlementOwnerDetail.setInvoicingCompanyGroupCode(orderChild.getInvoicingCompanyGroupCode());
 
-                    //设置开票公司信息
-                    settlementOwnerDetail.setInvoicingCompanyId(orderChild.getInvoicingCompanyId());
-                    settlementOwnerDetail.setInvoicingCompanyShorterName(orderChild.getInvoicingCompanyShorterName());
-                    settlementOwnerDetail.setInvoicingCompanyGroupCode(orderChild.getInvoicingCompanyGroupCode());
+                // 查询开票公司
+                InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompany(
+                        settlementOwnerDetail.getInvoicingCompanyId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
-                    // 查询开票公司
-                    InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompany(
-                            settlementOwnerDetail.getInvoicingCompanyId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-
-                    settlementOwnerDetail.setInvoiceServiceFeeRate(
-                            invoiceCompany.getServiceFeeRate() == null ? BigDecimal.ZERO : invoiceCompany.getServiceFeeRate());
-                }
+                settlementOwnerDetail.setInvoiceServiceFeeRate(
+                        invoiceCompany.getServiceFeeRate() == null ? BigDecimal.ZERO : invoiceCompany.getServiceFeeRate());
             }
         }