订单报价-货主运单计费--列表、导出-新增开票配置

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

@@ -554,9 +554,10 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         fieldList.add(new ExcelField(16, "开票金额", "invoiceFreight", 5000));
         fieldList.add(new ExcelField(17, "开票公司", "invoicingCompanyShorterName", 5000));
         fieldList.add(new ExcelField(18, "开票标识", "invoiceType", 5000));
-        fieldList.add(new ExcelField(19, "订单编号", "orderNo", 5000));
-        fieldList.add(new ExcelField(20, "结算单号", "settlementNo", 5000));
-        fieldList.add(new ExcelField(21, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(19, "开票配置", "invoiceConfigType", 5000));
+        fieldList.add(new ExcelField(20, "订单编号", "orderNo", 5000));
+        fieldList.add(new ExcelField(21, "结算单号", "settlementNo", 5000));
+        fieldList.add(new ExcelField(22, "创建时间", "createTime", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -584,6 +585,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
             rowData.add(new ExcelData(dto.getInvoiceFreight()==null?null:dto.getInvoiceFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getInvoicingCompanyShorterName()));
             rowData.add(new ExcelData(dto.getInvoiceType()==null?null:SettlementOwnerEnum.InvoiceType.getMsgByCode(dto.getInvoiceType())));
+            rowData.add(new ExcelData(dto.getInvoicingConfigType()==null?null:SettlementOwnerEnum.InvoiceConfigType.getMsgByCode(dto.getInvoicingConfigType())));
             rowData.add(new ExcelData(dto.getOrderNo()));
             rowData.add(new ExcelData(dto.getSettlementNo()));
             rowData.add(new ExcelData(dto.getCreateTime()));

performance-api/src/main/java/com/clx/performance/enums/settle/SettlementOwnerEnum.java

@@ -134,7 +134,24 @@ public enum SettlementOwnerEnum {
         }
     }
 
+    @Getter
+    @AllArgsConstructor
+    public enum InvoiceConfigType {
+        NO(0, "否"),
+        YES(1, "是"),
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<InvoiceConfigType> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
 
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(InvoiceConfigType::getMsg).orElse(null);
+        }
+    }
 
 
 

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementOwnerDetailVO.java

@@ -74,6 +74,8 @@ public class CarrierPageSettlementOwnerDetailVO {
     private BigDecimal invoiceServiceFee;
     @Schema(description = "开票服务率")
     private BigDecimal invoiceServiceFeeRate;
+    @Schema(description = "开票配置：0-否，1-是")
+    private Integer invoicingConfigType;
     @MoneyOutConvert
     @Schema(description = "借款抵扣金额")
     private BigDecimal loanFreight;