修改新增流水查询

src/main/java/com/qtzl/alterSales/manager/handler/FssPaccountPayByVehicleIdHandler.java

@@ -99,13 +99,6 @@ public class FssPaccountPayByVehicleIdHandler extends AbstractAfterSalesManager<
                 list.add(cb.lessThanOrEqualTo(root.<LocalDateTime>get("chargeTime"), request.getEndTime()));
             }
 
-            if (!StringUtils.isEmpty(request.getPayId()) ) {
-                list.add(cb.equal(root.<String>get("payId"), request.getPayId()));
-            }
-            if (!StringUtils.isEmpty(request.getWxOrderId())) {
-                list.add(cb.equal(root.<String>get("wxOrderId"), request.getWxOrderId()));
-            }
-
             Predicate[] p = new Predicate[list.size()];
             return cb.and(list.toArray(p));
         }), PageRequest.of(request.getPageNo() - 1, request.getPageSize(), Sort.by(Sort.Direction.DESC, "chargeTime")));

src/main/java/com/qtzl/alterSales/manager/handler/FssPaccountPayQueryPageHandler.java

@@ -20,7 +20,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.persistence.criteria.Predicate;
@@ -98,6 +97,12 @@ public class FssPaccountPayQueryPageHandler extends AbstractAfterSalesManager<Fs
             if (null != request.getStatus()) {
                 list.add(cb.equal(root.<Integer>get("status"), request.getStatus()));
             }
+            if (!StringUtils.isEmpty(request.getPayId()) ) {
+                list.add(cb.equal(root.<String>get("payId"), request.getPayId()));
+            }
+            if (!StringUtils.isEmpty(request.getWxOrderId())) {
+                list.add(cb.equal(root.<String>get("wxOrderId"), request.getWxOrderId()));
+            }
             Predicate[] p = new Predicate[list.size()];
             return cb.and(list.toArray(p));
         }), PageRequest.of(request.getPageNo() - 1, request.getPageSize(), Sort.by(Sort.Direction.DESC, "chargeTime")));

src/main/java/com/qtzl/alterSales/manager/model/protocol/sales/FssPaccountPayByVehicleIdRequest.java

@@ -22,11 +22,6 @@ public class FssPaccountPayByVehicleIdRequest extends AbstractAfterSalesPageRequ
     /*** 车牌号*/
     private Integer plateColor;
 
-    /*** 路网交易编号*/
-    private String payId;
-
-    /*** 向微信请款使用的订单号*/
-    private String wxOrderId;
 
     private LocalDateTime startTime;
 
@@ -64,19 +59,4 @@ public class FssPaccountPayByVehicleIdRequest extends AbstractAfterSalesPageRequ
         this.endTime = endTime;
     }
 
-    public String getPayId() {
-        return payId;
-    }
-
-    public void setPayId(String payId) {
-        this.payId = payId;
-    }
-
-    public String getWxOrderId() {
-        return wxOrderId;
-    }
-
-    public void setWxOrderId(String wxOrderId) {
-        this.wxOrderId = wxOrderId;
-    }
 }

src/main/java/com/qtzl/alterSales/manager/model/protocol/sales/FssPaccountPayQueryPageRequest.java

@@ -20,6 +20,13 @@ public class FssPaccountPayQueryPageRequest extends AbstractAfterSalesPageReques
 
     private Integer status;
 
+    /*** 路网交易编号*/
+    private String payId;
+
+    /*** 向微信请款使用的订单号*/
+    private String wxOrderId;
+
+
     public String getPlateNumber() {
         return plateNumber;
     }
@@ -43,4 +50,20 @@ public class FssPaccountPayQueryPageRequest extends AbstractAfterSalesPageReques
     public void setStatus(Integer status) {
         this.status = status;
     }
+
+    public String getPayId() {
+        return payId;
+    }
+
+    public void setPayId(String payId) {
+        this.payId = payId;
+    }
+
+    public String getWxOrderId() {
+        return wxOrderId;
+    }
+
+    public void setWxOrderId(String wxOrderId) {
+        this.wxOrderId = wxOrderId;
+    }
 }