Merge branch 'refs/heads/v20.9_settlement_20240805' into dev

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

@@ -45,6 +45,10 @@ public class CarrierSettlementOwnerDetailVO {
 
     @ApiModelProperty(value = "实际净重（吨）", example = "1.23")
     private BigDecimal weight;
+    @ApiModelProperty(value = "装货净重（单位吨）", example = "1.23")
+    private BigDecimal loadNet;
+    @ApiModelProperty(value = "卸货净重（单位吨）", example = "1.23")
+    private BigDecimal unloadNet;
 
     @ApiModelProperty(value = "实际运费（元）", example = "1.23")
     @MoneyOutConvert

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

@@ -95,6 +95,9 @@ public class PageOwnerSettlementOwnerDetailVO {
     @ApiModelProperty(value="开票金额",example = "2.1")
     private BigDecimal invoiceFreight;
 
+    @ApiModelProperty(value = "开票标识：1网运单 2普通单",example = "2")
+    private Integer invoiceType;
+
     @ApiModelProperty(value="开票标识：1网运单 2普通单",example = "普通单")
     private String invoiceTypeMsg;
 

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDetailDaoImpl.java

@@ -243,7 +243,7 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
     @Override
     public IPage<SettlementOwnerDetail> pageInvoiceOwnerSettlementOrderDetailList(PageInvoiceOwnerSettlementOwnerDetailParam param) {
         LambdaQueryWrapper<SettlementOwnerDetail> query = new LambdaQueryWrapper<>();
-        query.in(SettlementOwnerDetail :: getFinalPaymentStatus, SettlementOwnerDetailEnum.FinalPaymentStatus.YES,SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE);
+        query.in(SettlementOwnerDetail :: getFinalPaymentStatus, SettlementOwnerDetailEnum.FinalPaymentStatus.YES.getCode(),SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());
         query.eq(SettlementOwnerDetail::getInvoiceStatus,param.getInvoiceStatus());
         query.eq(Objects.nonNull(param.getOwnerUserNo()),SettlementOwnerDetail::getOwnerUserNo,param.getOwnerUserNo());
         query.like(StringUtils.isNotBlank(param.getOwnerName()),SettlementOwnerDetail :: getOwnerName,param.getOwnerName());