承运与无车承运对接

performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsVO.java

@@ -144,4 +144,12 @@ public class OrderGoodsVO {
 
     @ApiModelProperty("可装车时间段结束")
     private String loadEndTime;
+
+    @ApiModelProperty("平台服务费费率%")
+    private BigDecimal platformServiceFeeRate;
+
+    @MoneyOutConvert
+    @ApiModelProperty("接单保证金（分/车）")
+    private BigDecimal deposit;
+
 }
\ No newline at end of file

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

@@ -73,6 +73,17 @@ public class CarrierPageSettlementDriverDetailVO {
     @MoneyOutConvert
     @ApiModelProperty(value = "开票金额")
     private BigDecimal invoiceFreight;
+
+    @ApiModelProperty(value = "开票公司id")
+    private Integer invoicingCompanyId;
+    @ApiModelProperty(value = "开票公司简称")
+    private Integer invoicingCompanyShorterName;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "开票服务费")
+    private BigDecimal invoiceServiceFee;
+    @ApiModelProperty(value = "开票服务率%")
+    private BigDecimal invoiceServiceFeeRate;
+
     @ApiModelProperty(value = "创建时间")
     private String createTime;
 

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

@@ -74,6 +74,10 @@ public class CarrierPageSettlementOwnerDetailVO {
     private BigDecimal loanFreight;
     @ApiModelProperty("结算方式  1装车净重 2卸车净重")
     private Integer settlementWay;
+    @ApiModelProperty("开票公司id")
+    private Integer invoicingCompanyId;
+    @ApiModelProperty("开票公司简称")
+    private String invoicingCompanyShorterName;
     @ApiModelProperty(value = "创建时间")
     private String createTime;
 

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

@@ -92,7 +92,7 @@ public class PageOwnerSettlementOwnerDetailVO {
     @ApiModelProperty(value="开票状态 0-否,1-是",example = "是")
     private String invoiceStatusMsg;
 
-    @ApiModelProperty(value="结算方式  1装车净重 2卸车净重 3卸车净重（减货损",example = "1")
+    @ApiModelProperty(value="结算方式  1装车净重 2卸车净重 3卸车净重（减货损）",example = "1")
     private Integer settlementWay;
 
 

performance-web/src/main/java/com/clx/performance/model/OrderGoods.java

@@ -189,6 +189,11 @@ public class OrderGoods implements HasKey<Integer> {
     @ApiModelProperty("批次号")
     private Long batchNumber;
 
+    @ApiModelProperty("平台服务费费率%")
+    private BigDecimal platformServiceFeeRate;
+    @ApiModelProperty("接单保证金（分/车）")
+    private BigDecimal deposit;
+
     @TableField("create_time")
     @ApiModelProperty("创建时间")
     private LocalDateTime createTime;

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

@@ -48,6 +48,10 @@ public class SettlementDriverDetail implements HasKey<Integer> {
     private Integer loanTypeFlag;                   //借款类型标示  0：虚拟货币+资金 1：虚拟货币 2：资金
     private BigDecimal settlementFreight;           //结算金额（分）
     private Integer invoiceType;                    //开票标识：1网运单 2普通单
+    private Integer invoicingCompanyId;             //开票公司id
+    private Integer invoicingCompanyShorterName;    //开票公司简称
+    private BigDecimal invoiceServiceFee;           //开票服务费（分）
+    private BigDecimal invoiceServiceFeeRate;       //开票服务费费率%
     private Integer status;                         //状态
     private LocalDateTime createTime;                      //创建时间
     private LocalDateTime modifiedTime;                    //修改时间