提交收费策略价格

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/ParkingWalletFeeSaveParam.java

@@ -53,7 +53,6 @@ public class ParkingWalletFeeSaveParam extends PageReq implements Serializable {
     /**
      * 凭证图片
      */
-    @NotBlank(message = "凭证图片不能为空")
     @Schema(description = "凭证图片")
     private String voucherUrl;
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/ParkingWalletFeeService.java

@@ -26,6 +26,7 @@ import com.sckw.transport.repository.KwtParkingWalletFeeBalanceRepository;
 import com.sckw.transport.repository.KwtParkingWalletFeeRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -180,6 +181,8 @@ public class ParkingWalletFeeService {
         return  Wrappers.<KwtParkingWalletFee>lambdaQuery()
                 .eq(param.getSupEntId() != null, KwtParkingWalletFee::getSupEntId, param.getSupEntId())
                 .eq(param.getProEntId() != null, KwtParkingWalletFee::getProEntId, param.getProEntId())
+                .ge(param.getMinFee() != null, KwtParkingWalletFee::getServiceFeeBalance, param.getMinFee())
+                .le(param.getMaxFee() != null, KwtParkingWalletFee::getServiceFeeBalance, param.getMaxFee())
                 .orderByDesc(KwtParkingWalletFee::getUpdateTime);
     }
 
@@ -284,13 +287,13 @@ public class ParkingWalletFeeService {
         return  Wrappers.<KwtParkingWalletFeeBalance>lambdaQuery()
                 .eq(param.getSupEntId() != null, KwtParkingWalletFeeBalance::getSupEntId, param.getSupEntId())
                 .eq(param.getProEntId() != null, KwtParkingWalletFeeBalance::getProEntId, param.getProEntId())
-                .eq(KwtParkingWalletFeeBalance::getOrderNo, param.getOrderNo())
-                .eq(KwtParkingWalletFeeBalance::getTradeType, param.getTradeType())
-                .ge(KwtParkingWalletFeeBalance::getTradeAmount, param.getMinFee())
-                .le(KwtParkingWalletFeeBalance::getTradeAmount, param.getMaxFee())
-                .ge(KwtParkingWalletFeeBalance::getCreateTime, param.getStartCreateTime())
-                .le(KwtParkingWalletFeeBalance::getCreateTime, param.getEndCreateTime())
-                .orderByDesc(KwtParkingWalletFeeBalance::getServiceFeeBalance);
+                .eq(StringUtils.isNotBlank(param.getOrderNo()), KwtParkingWalletFeeBalance::getOrderNo, param.getOrderNo())
+                .eq(param.getTradeType() != null,KwtParkingWalletFeeBalance::getTradeType, param.getTradeType())
+                .ge(param.getMinFee() != null, KwtParkingWalletFeeBalance::getTradeAmount, param.getMinFee())
+                .le(param.getMaxFee() != null, KwtParkingWalletFeeBalance::getTradeAmount, param.getMaxFee())
+                .ge(param.getStartCreateTime() != null, KwtParkingWalletFeeBalance::getCreateTime, param.getStartCreateTime())
+                .le(param.getEndCreateTime() != null, KwtParkingWalletFeeBalance::getCreateTime, param.getEndCreateTime())
+                .orderByDesc(KwtParkingWalletFeeBalance::getCreateTime);
     }
 
     /**
@@ -306,7 +309,7 @@ public class ParkingWalletFeeService {
                 .map(feeBalance -> {
                     ParkingWalletFeeBalanceResp resp = new ParkingWalletFeeBalanceResp();
                     resp.setId(feeBalance.getId());
-                    resp.setOrderNo(feeBalance.getOrderNo());
+                    resp.setOrderNo(Objects.equals(feeBalance.getOrderNo(), "-1") ? null : feeBalance.getOrderNo());
                     resp.setProEntId(feeBalance.getProEntId());
                     resp.setProEntName(getEntName(feeBalance.getProEntId()));
                     resp.setSupEntId(feeBalance.getSupEntId());