结算单优化

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

@@ -64,6 +64,10 @@ public class PageOwnerSettlementOwnerDetailVO {
     @ApiModelProperty(value="应付运费",example = "2.52")
     private BigDecimal freight;
 
+    @MoneyOutConvert
+    @ApiModelProperty(value="司机实收",example = "2.52")
+    private BigDecimal driverFreight;
+
     @MoneyOutConvert
     @ApiModelProperty(value="损耗单价",example = "1.2")
     private BigDecimal lossPrice;

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

@@ -255,8 +255,7 @@ 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.getFreight().subtract(dto.getLossFreight())));
+            rowData.add(new ExcelData(dto.getDriverFreight().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)));