承运与无车承运对接

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

@@ -13,7 +13,9 @@ public enum SettlementWayEnum {
     @AllArgsConstructor
     public enum WayType {
         LOAD(1, "装车净重"),
-        UNLOAD(2, "卸车净重");
+        UNLOAD(2, "卸车净重"),
+        UNLOAD_LOSS(3, "卸车净重（减货损）"),
+        ;
         private final Integer code;
         private final String msg;
 

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

@@ -51,6 +51,10 @@ public class CarrierPageSettlementOwnerVO {
     @MoneyOutConvert
     @ApiModelProperty(value = "开票金额")
     private BigDecimal invoiceFreight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "开票服务费")
+    private BigDecimal invoiceServiceFee;
+
     @ApiModelProperty(value = "创建时间")
     private String createTime;
     @ApiModelProperty(value = "状态 10:待锁定  20:待对账  30:待货主确认 40:待货主付款 50:待平台确认付款 60:待平台付款 70:待货主确认付款 80:待邮寄发票 90:已完结")

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

@@ -29,10 +29,10 @@ public class SettlementOwner implements HasKey<Integer> {
     private Integer id;                             //id
     private Long ownerUserNo;                       //货主用户编号
     private String ownerName;                       //货主名称
-    private Integer settlementWay;                  //结算方式  1装车净重 2卸车净重
+    private Integer settlementWay;                  //结算方式  1装车净重 2卸车净重 3卸车净重（减货损）
     private String settlementNo;                    //结算单编号
     private String settlementSubNo;                 //结算子单号
-    private Integer settlementPeriodType;           //结算周期类型：1拉运完成结 2月结
+    private Integer settlementPeriodType;           //结算周期类型：1拉运完成结 2月结 3日结
     private LocalDateTime settlementPeriodTime;     //结算周期时间（月结）
     private String orderNo;                         //订单编号
     private BigDecimal weight;                      //实际净重（吨）
@@ -45,6 +45,7 @@ public class SettlementOwner implements HasKey<Integer> {
     private Integer invoiceType;                    //开票标识：1网运单 2普通单
     private BigDecimal invoiceFreight;              //开票金额（分）
     private String invoiceImg;                      //结算凭证
+    private BigDecimal invoiceServiceFee;           //开票服务费（分）
     private String payee;                           //收款人
     private String payeeBankName;                   //收款银行
     private String payeeBankCardNo;                //收款银行卡卡号

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

@@ -427,10 +427,11 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         fieldList.add(new ExcelField(8, "预付运费金额", "prepayFreight", 5000));
         fieldList.add(new ExcelField(9, "货损吨数", "lossWeight", 5000));
         fieldList.add(new ExcelField(10, "货损金额", "lossFreight", 5000));
-        fieldList.add(new ExcelField(11, "结算金额", "settlementFreight", 5000));
-        fieldList.add(new ExcelField(12, "开票金额", "invoiceFreight", 5000));
-        fieldList.add(new ExcelField(13, "创建时间", "createTime", 5000));
-        fieldList.add(new ExcelField(14, "状态", "status", 5000));
+        fieldList.add(new ExcelField(11, "开票服务费", "invoiceServiceFee", 5000));
+        fieldList.add(new ExcelField(12, "结算金额", "settlementFreight", 5000));
+        fieldList.add(new ExcelField(13, "开票金额", "invoiceFreight", 5000));
+        fieldList.add(new ExcelField(14, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(15, "状态", "status", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -450,6 +451,7 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
             rowData.add(new ExcelData(dto.getPrepayFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getLossWeight()));
             rowData.add(new ExcelData(dto.getLossFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getInvoiceServiceFee().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getSettlementFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getInvoiceFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getCreateTime()));