订单添加时间查询

web/admin-api/src/main/java/pay/platform/api/system/model/query/PayOrderQuery.java

@@ -7,6 +7,7 @@ import pay.platform.core.common.domain.BasePageQuery;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 通道管理 实体类。
@@ -101,4 +102,6 @@ public class PayOrderQuery extends BasePageQuery {
      */
     @Schema(description = "修改时间")
     private LocalDateTime updateTime;
+    
+    private List<String> times;
 }

web/admin-api/src/main/java/pay/platform/api/system/servcie/impl/PayOrderServiceImpl.java

@@ -6,6 +6,7 @@ import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryColumn;
 import com.mybatisflex.core.query.QueryMethods;
 import com.mybatisflex.core.query.QueryWrapper;
+import com.mybatisflex.core.util.CollectionUtil;
 import com.mybatisflex.core.util.StringUtil;
 import org.springframework.stereotype.Service;
 import pay.platform.api.system.model.query.PayOrderQuery;
@@ -40,7 +41,12 @@ public class PayOrderServiceImpl extends BaseService<PayOrderMapper, PayOrder> i
                 .and(PayOrderTableDef.PAY_ORDER.PLATFORM_ORDER_NO.like(query.getPlatformOrderNo(), StringUtil.isNotBlank(query.getPlatformOrderNo())))
                 .and(PayOrderTableDef.PAY_ORDER.MERCHANT_ID.like(query.getMerchantId(), query.getMerchantId() != null)
                         .and(PayOrderTableDef.PAY_ORDER.AGENT_ID.like(query.getAgentId(), query.getAgentId() != null)
+
                                 .and(PayOrderTableDef.PAY_ORDER.STATUS.eq(query.getStatus(), query.getStatus() != null)))).orderBy(PayOrderTableDef.PAY_ORDER.CREATE_TIME.desc());
+        if (CollectionUtil.isNotEmpty(query.getTimes())) {
+            queryWrapper.and(PayOrderTableDef.PAY_ORDER.CREATE_TIME.ge(query.getTimes().get(0) + " 00:00:00", CollectionUtil.isNotEmpty(query.getTimes())))
+                    .and(PayOrderTableDef.PAY_ORDER.CREATE_TIME.le(query.getTimes().get(1) + " 23:59:59", CollectionUtil.isNotEmpty(query.getTimes())));
+        }
         Page<PayOrder> page = mapper.paginate(new Page<>(query.getCurrent(), query.getSize()), queryWrapper);
         List<PayOrderVO> vos = BeanUtil.copyToList(page.getRecords(), PayOrderVO.class);
         return new BasePage<>(page.getPageNumber(), page.getPageSize(), page.getTotalRow(), vos);

web/agent-api/src/main/java/pay/platform/api/system/model/query/PayOrderQuery.java

@@ -10,6 +10,7 @@ import pay.platform.core.common.domain.BasePageQuery;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 通道管理 实体类。
@@ -103,4 +104,6 @@ public class PayOrderQuery extends BasePageQuery {
      */
     @Schema(description = "修改时间")
     private LocalDateTime updateTime;
+
+    private List<String> times;
 }

web/agent-api/src/main/java/pay/platform/api/system/servcie/impl/PayOrderServiceImpl.java

@@ -6,6 +6,7 @@ import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryColumn;
 import com.mybatisflex.core.query.QueryMethods;
 import com.mybatisflex.core.query.QueryWrapper;
+import com.mybatisflex.core.util.CollectionUtil;
 import com.mybatisflex.core.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -44,6 +45,10 @@ public class PayOrderServiceImpl extends BaseService<PayOrderMapper, PayOrder> i
                 .and(PayOrderTableDef.PAY_ORDER.MERCHANT_ID.eq(query.getMerchantId(), query.getMerchantId() != null)
                         .and(PayOrderTableDef.PAY_ORDER.AGENT_ID.eq(SecurityUtil.getCurrentUser().getUserid(), StringUtil.isNotBlank(SecurityUtil.getCurrentUser().getUserid()))
                                 .and(PayOrderTableDef.PAY_ORDER.STATUS.eq(query.getStatus(), query.getStatus() != null)))).orderBy(PayOrderTableDef.PAY_ORDER.CREATE_TIME.desc());
+        if (CollectionUtil.isNotEmpty(query.getTimes())) {
+            queryWrapper.and(PayOrderTableDef.PAY_ORDER.CREATE_TIME.ge(query.getTimes().get(0) + " 00:00:00", CollectionUtil.isNotEmpty(query.getTimes())))
+                    .and(PayOrderTableDef.PAY_ORDER.CREATE_TIME.le(query.getTimes().get(1) + " 23:59:59", CollectionUtil.isNotEmpty(query.getTimes())));
+        }
         Page<PayOrder> page = mapper.paginate(new Page<>(query.getCurrent(), query.getSize()), queryWrapper);
         List<PayOrderVO> vos = BeanUtil.copyToList(page.getRecords(), PayOrderVO.class);
         return new BasePage<>(page.getPageNumber(), page.getPageSize(), page.getTotalRow(), vos);

web/merchant-api/src/main/java/pay/platform/api/system/model/query/PayOrderQuery.java

@@ -10,6 +10,7 @@ import pay.platform.core.common.domain.BasePageQuery;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 通道管理 实体类。
@@ -103,4 +104,6 @@ public class PayOrderQuery extends BasePageQuery {
      */
     @Schema(description = "修改时间")
     private LocalDateTime updateTime;
+
+    private List<String> times;
 }

web/merchant-api/src/main/java/pay/platform/api/system/servcie/impl/PayOrderServiceImpl.java

@@ -57,6 +57,10 @@ public class PayOrderServiceImpl extends BaseService<PayOrderMapper, PayOrder> i
                 .and(PayOrderTableDef.PAY_ORDER.PLATFORM_ORDER_NO.like(query.getPlatformOrderNo(), StringUtil.isNotBlank(query.getPlatformOrderNo())))
                 .and(PayOrderTableDef.PAY_ORDER.MERCHANT_ID.eq(SecurityUtil.getCurrentUser().getUserid(), StringUtil.isNotBlank(SecurityUtil.getCurrentUser().getUserid()))
                         .and(PayOrderTableDef.PAY_ORDER.STATUS.eq(query.getStatus(), query.getStatus() != null))).orderBy(PayOrderTableDef.PAY_ORDER.CREATE_TIME.desc());
+        if (CollectionUtil.isNotEmpty(query.getTimes())) {
+            queryWrapper.and(PayOrderTableDef.PAY_ORDER.CREATE_TIME.ge(query.getTimes().get(0) + " 00:00:00", CollectionUtil.isNotEmpty(query.getTimes())))
+                    .and(PayOrderTableDef.PAY_ORDER.CREATE_TIME.le(query.getTimes().get(1) + " 23:59:59", CollectionUtil.isNotEmpty(query.getTimes())));
+        }
         Page<PayOrder> page = mapper.paginate(new Page<>(query.getCurrent(), query.getSize()), queryWrapper);
         List<PayOrderVO> vos = BeanUtil.copyToList(page.getRecords(), PayOrderVO.class);
         return new BasePage<>(page.getPageNumber(), page.getPageSize(), page.getTotalRow(), vos);