Merge remote-tracking branch 'origin/test' into test

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

@@ -59,6 +59,8 @@ public class CarrierPageSettlementDriverDetailVO {
     @MoneyOutConvert
     @ApiModelProperty(value = "预付运费金额")
     private BigDecimal prepayFreight;
+    @ApiModelProperty(value = "预付运费标示  0:未预付 1：已预付")
+    private Integer prepayFreightFlag;
     @MoneyOutConvert
     @ApiModelProperty(value = "结算金额")
     private BigDecimal settlementFreight;

performance-web/src/main/java/com/clx/performance/sqlProvider/settle/NetworkDriverRunningWaterRecordProvider.java

@@ -62,7 +62,11 @@ public class NetworkDriverRunningWaterRecordProvider {
             }
             if (ObjectUtil.isNotNull(param.getFundType())) {
                 WHERE("a.fund_type = #{param.fundType}");
+            } else {
+                WHERE("a.fund_type != " + NetworkDriverAccountEnum.FundType.FROZEN.getCode());
             }
+            WHERE("a.running_water_type != " + NetworkDriverAccountEnum.RunningWaterStatus.CASE_OUT_FROZEN.getCode());
+
             ORDER_BY("a.create_time desc");
         }}.toString();
         return sql;