承运与无车承运对接

performance-api/src/main/java/com/clx/performance/vo/pc/owner/settle/PageOwnerSettlementOwnerDetailVO.java

@@ -80,13 +80,19 @@ public class PageOwnerSettlementOwnerDetailVO {
     @ApiModelProperty(value="开票标识：1网运单 2普通单",example = "普通单")
     private String invoiceTypeMsg;
 
+    @MoneyOutConvert
+    @ApiModelProperty(value="开票服务费",example = "2.1")
+    private BigDecimal invoiceServiceFee;
+    @ApiModelProperty(value="开票费率%",example = "12.34")
+    private BigDecimal invoiceServiceFeeRate;
+
     @ApiModelProperty(value="尾款状态 0-否,1-是,2-无需支付",example = "无需支付")
     private String finalPaymentStatusMsg;
 
     @ApiModelProperty(value="开票状态 0-否,1-是",example = "是")
     private String invoiceStatusMsg;
 
-    @ApiModelProperty(value="结算方式  1装车净重 2卸车净重",example = "1")
+    @ApiModelProperty(value="结算方式  1装车净重 2卸车净重 3卸车净重（减货损",example = "1")
     private Integer settlementWay;
 
 

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

@@ -52,6 +52,8 @@ public class SettlementOwnerDetail implements HasKey<Integer> {
     private BigDecimal loanFreight;                 //借款抵扣金额（分）
     private BigDecimal invoiceFreight;              //开票金额（分）
     private Integer invoiceType;                    //开票标识：1网运单 2普通单
+    private BigDecimal invoiceServiceFee;           //开票服务费（分）
+    private BigDecimal invoiceServiceFeeRate;       //开票服务率
     private Integer finalPaymentStatus;             //尾款状态 0-否,1-是,2-无需支付
     private Integer invoiceStatus;                  //开票状态 0-否,1-是,2-无需开票
     private Integer invoicingCompanyId;  //开票公司id

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

@@ -202,18 +202,20 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         fieldList.add(new ExcelField(8, "货损吨数", "lossWeight", 5000));
         fieldList.add(new ExcelField(9, "货损单价", "lossPrice", 5000));
         fieldList.add(new ExcelField(10, "货损金额", "lossFreight", 5000));
-        fieldList.add(new ExcelField(11, "预付运费金额", "prepayFreight", 5000));
-        fieldList.add(new ExcelField(12, "结算金额", "settlementFreight", 5000));
-        fieldList.add(new ExcelField(13, "借款抵扣金额", "loanFreight", 5000));
-
-        fieldList.add(new ExcelField(14, "开票金额", "invoiceFreight", 5000));
-        fieldList.add(new ExcelField(15, "开票标识", "invoiceType", 5000));
-        fieldList.add(new ExcelField(16, "订单编号", "orderNo", 5000));
-        fieldList.add(new ExcelField(17, "结算单号", "settlementNo", 15000));
-        fieldList.add(new ExcelField(18, "结算子单号", "settlementSubNo", 15000));
-        fieldList.add(new ExcelField(19, "创建时间", "createTime", 5000));
-        fieldList.add(new ExcelField(20, "是否已付尾款", "finalPaymentStatus", 5000));
-        fieldList.add(new ExcelField(21, "是否已开票", "invoiceStatus", 5000));
+        fieldList.add(new ExcelField(11, "开票费率", "invoiceServiceFeeRate", 5000));
+        fieldList.add(new ExcelField(12, "开票服务费", "invoiceServiceFee", 5000));
+        fieldList.add(new ExcelField(13, "预付运费金额", "prepayFreight", 5000));
+        fieldList.add(new ExcelField(14, "结算金额", "settlementFreight", 5000));
+        fieldList.add(new ExcelField(15, "借款抵扣金额", "loanFreight", 5000));
+
+        fieldList.add(new ExcelField(16, "开票金额", "invoiceFreight", 5000));
+        fieldList.add(new ExcelField(17, "开票标识", "invoiceType", 5000));
+        fieldList.add(new ExcelField(18, "订单编号", "orderNo", 5000));
+        fieldList.add(new ExcelField(19, "结算单号", "settlementNo", 15000));
+        fieldList.add(new ExcelField(20, "结算子单号", "settlementSubNo", 15000));
+        fieldList.add(new ExcelField(21, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(22, "是否已付尾款", "finalPaymentStatus", 5000));
+        fieldList.add(new ExcelField(23, "是否已开票", "invoiceStatus", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -235,9 +237,12 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
             rowData.add(new ExcelData(dto.getLossWeight()));
             rowData.add(new ExcelData(dto.getLossPrice().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getLossFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getInvoiceServiceFeeRate().toString()+ "%"));
+            rowData.add(new ExcelData(dto.getInvoiceServiceFee().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getPrepayFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getSettlementFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getLoanFreight().movePointLeft(2)));
+
             rowData.add(new ExcelData(dto.getInvoiceFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getInvoiceTypeMsg()));
             rowData.add(new ExcelData(dto.getOrderNo()));