订单报价-货主运单计费-保存开票配置

clx-performance-web/src/main/java/com/clx/performance/extranal/order/InvoicingCompanyService.java

@@ -9,6 +9,6 @@ public interface InvoicingCompanyService {
 
     InvoicingCompanyVO getInvoicingCompanyByGroupCode(String companyGroupCode);
 
-    Integer getInvoicingConfigTypeByOrderNo(Integer orderNo);
+    Integer getInvoicingConfigTypeByOrderNo(String orderNo);
 
 }

clx-performance-web/src/main/java/com/clx/performance/extranal/order/impl/InvoicingCompanyServiceImpl.java

@@ -31,10 +31,10 @@ public class InvoicingCompanyServiceImpl implements InvoicingCompanyService {
     }
 
     @Override
-    public Integer getInvoicingConfigTypeByOrderNo(Integer orderNo) {
+    public Integer getInvoicingConfigTypeByOrderNo(String orderNo) {
         return Optional.of(invoicingCompanyFeign.getInvoicingConfigTypeByOrderNo(orderNo))
                 .filter(Result::succeed)
                 .map(Result::getData)
-                .orNull();;
+                .orNull();
     }
 }

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

@@ -147,11 +147,6 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         //借款抵扣金额初始化
         settlementOwnerDetail.setLoanFreight(BigDecimal.ZERO);
 
-        //设置开票公司信息
-        settlementOwnerDetail.setInvoicingCompanyId(orderChild.getInvoicingCompanyId());
-        settlementOwnerDetail.setInvoicingCompanyShorterName(orderChild.getInvoicingCompanyShorterName());
-        settlementOwnerDetail.setInvoicingCompanyGroupCode(orderChild.getInvoicingCompanyGroupCode());
-
         // 查询开票公司
         InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompany(
                 settlementOwnerDetail.getInvoicingCompanyId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
@@ -171,7 +166,19 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
                 settlementCommonService.invoiceFreightCalc(orderChild.getSettlementWay(),
                 orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail));
         // 开票配置
-        settlementOwnerDetail.setInvoiceConfigType(null);
+        Integer invoicingConfigType = invoicingCompanyService.getInvoicingConfigTypeByOrderNo(orderChild.getOrderNo());
+        settlementOwnerDetail.setInvoiceConfigType(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());
+            settlementOwnerDetail.setInvoicingCompanyShorterName(orderChild.getInvoicingCompanyShorterName());
+            settlementOwnerDetail.setInvoicingCompanyGroupCode(orderChild.getInvoicingCompanyGroupCode());
+        }
 
         // 结算金额
         settlementOwnerDetail.setSettlementFreight(