开票配置为是--货主、车主、待处理计费设置开票标识为普通单

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

@@ -2,7 +2,10 @@ package com.clx.performance.service.impl.settle;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.order.enums.InvoicingCompanyEnum;
+import com.clx.order.vo.pc.carrier.InvoicingCompanyVO;
 import com.clx.performance.dao.settle.SettlementDriverDetailDao;
+import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.loan.OwnerLoanRecordEnum;
 import com.clx.performance.enums.settle.SettlementDriverEnum;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
@@ -75,10 +78,6 @@ public class SettlementDriverDetailServiceImpl  implements SettlementDriverDetai
         // 结算金额
         settlementDriverDetail.setSettlementFreight(settlementFreightCalc(settlementDriverDetail.getFreight(), settlementDriverDetail.getLossFreight()));
 
-        settlementDriverDetail.setInvoicingCompanyId(orderChild.getInvoicingCompanyId());
-        settlementDriverDetail.setInvoicingCompanyShorterName(orderChild.getInvoicingCompanyShorterName());
-        settlementDriverDetail.setInvoicingCompanyGroupCode(orderChild.getInvoicingCompanyGroupCode());
-
         // 平台服务费： 司机结算金额*平台服务费费率
         settlementDriverDetail.setPlatformServiceFeeRate(orderChild.getPlatformServiceFeeRate()==null
                 ? BigDecimal.ZERO
@@ -89,8 +88,16 @@ public class SettlementDriverDetailServiceImpl  implements SettlementDriverDetai
 
         // 开票配置
         Integer invoiceConfigType = invoicingCompanyService.getInvoicingConfigTypeByOrderNo(orderChild.getOrderNo());
-        if (Objects.nonNull(invoiceConfigType)) {
-            settlementDriverDetail.setInvoiceConfigType(invoiceConfigType);
+        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())) {
+            //设置开票公司信息
+            settlementDriverDetail.setInvoicingCompanyId(orderChild.getInvoicingCompanyId());
+            settlementDriverDetail.setInvoicingCompanyShorterName(orderChild.getInvoicingCompanyShorterName());
+            settlementDriverDetail.setInvoicingCompanyGroupCode(orderChild.getInvoicingCompanyGroupCode());
         }
 
         settlementDriverDetailDao.saveEntity(settlementDriverDetail);

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

@@ -160,11 +160,12 @@ 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())) {
             // 赋值开票标识为普通单
             settlementDriverDetail.setInvoiceType(InvoicingCompanyEnum.RiskProcessType.AUTO.getCode());
-            // 若开票配置非空，且为是，则开票公司信息
+            // 若开票配置非空，且为是，则开票公司信息，开票标识为空（由后续封控系统处理）
         } else if (Objects.nonNull(invoicingConfigType) && Objects.equals(invoicingConfigType, InvoicingCompanyEnum.YesAndNo.YES.getCode())) {
             //设置开票公司信息
             settlementOwnerDetail.setInvoicingCompanyId(orderChild.getInvoicingCompanyId());