新增金额范围筛选

FullCardClient/src/main/java/com/zhongshu/card/client/model/pay/RechargeSearchParam.java

@@ -37,8 +37,11 @@ public class RechargeSearchParam {
     @Schema(description = "订单状态")
     private RechargeOrderStatus status;
 
-    @Schema(description = "金额")
-    private BigDecimal total;
+    @Schema(description = "支付金额最小")
+    private BigDecimal minPayAmount;
+
+    @Schema(description = "支付金额最大")
+    private BigDecimal maxPayAmount;
 
     @Schema(description = "订单号")
     private String orderNo;

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/ExpenseFlowSearchParam.java

@@ -36,8 +36,11 @@ public class ExpenseFlowSearchParam {
     @Schema(description = "支付结束时间")
     private Long payEndTime;
 
-    @Schema(description = "支付金额")
-    private BigDecimal payAmount;
+    @Schema(description = "支付金额最小")
+    private BigDecimal minPayAmount;
+
+    @Schema(description = "支付金额最大")
+    private BigDecimal maxPayAmount;
 
     @Schema(description = "订单的总体状态，待付款、支付中、已支付、已退款")
     private OrderState orderState;

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/pay/impl/BalanceRechargeOrderDaoImpl.java

@@ -144,8 +144,16 @@ public class BalanceRechargeOrderDaoImpl implements BalanceRechargeOrderDaoExten
             criteria.and("status").is(param.getStatus());
         }
 
-        if (param.getTotal() != null){
-            criteria.and("total").gte(param.getTotal());
+        if (param.getMinPayAmount() != null && param.getMaxPayAmount() == null){
+            criteria.and("total").gte(param.getMinPayAmount());
+        }
+
+        if (param.getMinPayAmount()==null && param.getMaxPayAmount() != null){
+            criteria.and("total").lte(param.getMaxPayAmount());
+        }
+
+        if (param.getMaxPayAmount() != null && param.getMinPayAmount() != null){
+            criteria.and("total").gte(param.getMinPayAmount()).lte(param.getMaxPayAmount());
         }
 
         if (StringUtils.isNotEmpty(param.getOrderNo())){

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/payment/impl/ExpenseFlowDaoImpl.java

@@ -317,8 +317,17 @@ public class ExpenseFlowDaoImpl extends BaseImpl implements ExpenseFlowDaoExtend
         }
 
         //支付金额
-        if (param.getPayAmount() != null){
-            criteria.and("payAmount").is(param.getPayAmount());
+
+        if (param.getMinPayAmount() != null && param.getMaxPayAmount() == null){
+            criteria.and("payAmount").gte(param.getMinPayAmount());
+        }
+
+        if (param.getMinPayAmount()==null && param.getMaxPayAmount() != null){
+            criteria.and("payAmount").lte(param.getMaxPayAmount());
+        }
+
+        if (param.getMaxPayAmount() != null && param.getMinPayAmount() != null){
+            criteria.and("payAmount").gte(param.getMinPayAmount()).lte(param.getMaxPayAmount());
         }
 
         //订单状态