Merge branch 'v30.6_order_quote_20241022' into test_jdk17

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

 package com.clx.performance.service.impl.broker;
 
+import com.clx.order.enums.InvoicingCompanyEnum;
 import com.clx.order.enums.QuotationEnum;
 import com.clx.order.feign.InvoicingCompanyFeign;
 import com.clx.order.feign.OrderFeign;
@@ -75,6 +76,8 @@ public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqH
 
         try{
             doOrderChildSync(mq);
+            // 同步-无车承运成功后，更新开票标识为普通单
+            updateInvoiceTypeByChildNo(mq.getChildNo());
 
         }catch (Exception e){
             log.info("无车承运-运单同步 失败，msg:{}", ExceptionUtils.getStackTrace(e));
@@ -199,9 +202,30 @@ public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqH
         // 调用开票配置接口
         Integer invoiceConfigType = invoicingCompanyFeign.getInvoicingConfigTypeByOrderNo(orderNo).getData();
         log.info("notInvoiceConfigType invoiceConfigType:{}", invoiceConfigType);
-        // 若开票配置为否
+        // 若开票配置为是
         return Objects.nonNull(invoiceConfigType) && Objects.equals(invoiceConfigType,
                 QuotationEnum.InvoicingConfigType.YES.getCode());
     }
 
+    /**
+     * 更新当前运单号，更新开票标识为普通单
+     */
+    public void updateInvoiceTypeByChildNo(String childNo) {
+        // 获取货主详情
+        SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao
+                .getByChildNo(childNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        // 获取车主详情
+        SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao
+                .getByChildNo(childNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        // 开票配置为否时，更新开票标识为普通单
+        if (!this.invoiceConfigType(settlementOwnerDetail.getOrderNo())) {
+            // 货主更新开票标识
+            settlementOwnerDetail.setInvoiceType(InvoicingCompanyEnum.RiskProcessType.AUTO.getCode());
+            settlementOwnerDetailDao.updateEntityByKey(settlementOwnerDetail);
+            // 车主更新开票标识
+            settlementDriverDetail.setInvoiceType(InvoicingCompanyEnum.RiskProcessType.AUTO.getCode());
+            settlementDriverDetailDao.updateEntityByKey(settlementDriverDetail);
+        }
+    }
+
 }

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

@@ -89,11 +89,7 @@ public class SettlementDriverDetailServiceImpl  implements SettlementDriverDetai
         // 开票配置
         Integer invoiceConfigType = invoicingCompanyService.getInvoicingConfigTypeByOrderNo(orderChild.getOrderNo());
         settlementDriverDetail.setInvoiceConfigType(invoiceConfigType);
-        // 若开票配置为否，设置开票标识为普通单
-        if (Objects.nonNull(invoiceConfigType) && Objects.equals(invoiceConfigType, InvoicingCompanyEnum.YesAndNo.NO.getCode())) {
-            // 开票标识
-            settlementDriverDetail.setInvoiceType(InvoicingCompanyEnum.RiskProcessType.AUTO.getCode());
-        } else if (Objects.nonNull(invoiceConfigType) && Objects.equals(invoiceConfigType, InvoicingCompanyEnum.YesAndNo.YES.getCode())) {
+        if (Objects.nonNull(invoiceConfigType) && Objects.equals(invoiceConfigType, InvoicingCompanyEnum.YesAndNo.YES.getCode())) {
             //设置开票公司信息
             settlementDriverDetail.setInvoicingCompanyId(orderChild.getInvoicingCompanyId());
             settlementDriverDetail.setInvoicingCompanyShorterName(orderChild.getInvoicingCompanyShorterName());

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

@@ -161,13 +161,8 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         Integer invoicingConfigType = invoicingCompanyService.getInvoicingConfigTypeByOrderNo(orderChild.getOrderNo());
         settlementOwnerDetail.setInvoiceConfigType(invoicingConfigType);
         log.info("saveSettlementDetail invoicingConfigType:{}", invoicingConfigType);
-        // 若开票配置为否，设置开票标识为普通单
-        if (Objects.nonNull(invoicingConfigType) && Objects.equals(invoicingConfigType, InvoicingCompanyEnum.YesAndNo.NO.getCode())) {
-            // 赋值开票标识为普通单
-            settlementOwnerDetail.setInvoiceType(InvoicingCompanyEnum.RiskProcessType.AUTO.getCode());
-            log.info("settlementOwnerDetail getInvoiceType:{}", settlementOwnerDetail.getInvoiceType());
-            // 若开票配置非空，且为是，则开票公司信息，开票标识为空（由后续封控系统处理）
-        } else if (Objects.nonNull(invoicingConfigType) && Objects.equals(invoicingConfigType, InvoicingCompanyEnum.YesAndNo.YES.getCode())) {
+        // 若开票配置非空，且为是，则开票公司信息，开票标识为空（由后续封控系统处理）
+        if (Objects.nonNull(invoicingConfigType) && Objects.equals(invoicingConfigType, InvoicingCompanyEnum.YesAndNo.YES.getCode())) {
             //设置开票公司信息
             settlementOwnerDetail.setInvoicingCompanyId(orderChild.getInvoicingCompanyId());
             settlementOwnerDetail.setInvoicingCompanyShorterName(orderChild.getInvoicingCompanyShorterName());