订单报价-开票配置

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

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

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

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

clx-performance-web/src/main/java/com/clx/performance/model/settle/SettlementOwnerDetail.java

@@ -62,6 +62,7 @@ public class SettlementOwnerDetail implements HasKey<Integer> {
     private Integer invoiceType;                    //开票标识：1网运单 2普通单
     private BigDecimal invoiceServiceFee;           //开票服务费（分）
     private BigDecimal invoiceServiceFeeRate;       //开票服务率
+    private Integer invoiceConfigType;              //开票配置类型：0-否，1-是
     private Integer finalPaymentStatus;             //尾款状态 0-否,1-是,2-无需支付
     private Integer invoiceTypeStatus;              // 开票标识状态：0未获取 1获取中 2获取成功 3获取失败
     private Integer invoiceStatus;                  //开票状态 0-否,1-是,2-无需开票

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

@@ -170,6 +170,8 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         settlementOwnerDetail.setInvoiceFreight(
                 settlementCommonService.invoiceFreightCalc(orderChild.getSettlementWay(),
                 orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail));
+        // 开票配置
+        settlementOwnerDetail.setInvoiceConfigType(null);
 
         // 结算金额
         settlementOwnerDetail.setSettlementFreight(