diff --git a/rc-service/rc-inner-api/order-inner/order-inner-model/src/main/java/com/red/circle/order/inner/model/cmd/inapp/InAppPurchaseDetailsQryCmd.java b/rc-service/rc-inner-api/order-inner/order-inner-model/src/main/java/com/red/circle/order/inner/model/cmd/inapp/InAppPurchaseDetailsQryCmd.java index 4b1018e0..ee2b2b45 100644 --- a/rc-service/rc-inner-api/order-inner/order-inner-model/src/main/java/com/red/circle/order/inner/model/cmd/inapp/InAppPurchaseDetailsQryCmd.java +++ b/rc-service/rc-inner-api/order-inner/order-inner-model/src/main/java/com/red/circle/order/inner/model/cmd/inapp/InAppPurchaseDetailsQryCmd.java @@ -4,6 +4,7 @@ import com.red.circle.framework.dto.Command; import com.red.circle.order.inner.model.enums.inapp.InAppPurchaseReceiptType; import com.red.circle.order.inner.model.enums.inapp.InAppPurchaseStatus; import java.io.Serial; +import java.sql.Timestamp; import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; @@ -85,12 +86,12 @@ public class InAppPurchaseDetailsQryCmd extends Command { /** * 开始时间. */ - private LocalDateTime startTime; + private Long startTime; /** * 结束时间. */ - private LocalDateTime endTime; + private Long endTime; /** * 最后一条记录id. diff --git a/rc-service/rc-service-order/order-infrastructure/src/main/java/com/red/circle/order/infra/database/mongo/order/impl/InAppPurchaseDetailsServiceImpl.java b/rc-service/rc-service-order/order-infrastructure/src/main/java/com/red/circle/order/infra/database/mongo/order/impl/InAppPurchaseDetailsServiceImpl.java index d33abd86..715c111a 100644 --- a/rc-service/rc-service-order/order-infrastructure/src/main/java/com/red/circle/order/infra/database/mongo/order/impl/InAppPurchaseDetailsServiceImpl.java +++ b/rc-service/rc-service-order/order-infrastructure/src/main/java/com/red/circle/order/infra/database/mongo/order/impl/InAppPurchaseDetailsServiceImpl.java @@ -15,11 +15,7 @@ import com.red.circle.tool.core.date.TimestampUtils; import com.red.circle.tool.core.text.StringUtils; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Sort; @@ -202,8 +198,8 @@ public class InAppPurchaseDetailsServiceImpl implements InAppPurchaseDetailsServ if (Objects.nonNull(query.getStartTime()) && Objects.nonNull(query.getEndTime())) { criteria.andOperator( - Criteria.where("createTime").gte(query.getStartTime()), - Criteria.where("createTime").lte(query.getEndTime()) + Criteria.where("createTime").gte(new Date(query.getStartTime())), + Criteria.where("createTime").lte(new Date(query.getEndTime())) ); } @@ -265,8 +261,8 @@ public class InAppPurchaseDetailsServiceImpl implements InAppPurchaseDetailsServ } if (Objects.nonNull(query.getStartTime()) && Objects.nonNull(query.getEndTime())) { criteria.andOperator( - Criteria.where("createTime").gte(query.getStartTime()), - Criteria.where("createTime").lte(query.getEndTime()) + Criteria.where("createTime").gte(new Date(query.getStartTime())), + Criteria.where("createTime").lte(new Date(query.getEndTime())) ); } diff --git a/rc-service/rc-service-order/order-infrastructure/src/main/java/com/red/circle/order/infra/database/mongo/order/query/InAppPurchaseDetailsQuery.java b/rc-service/rc-service-order/order-infrastructure/src/main/java/com/red/circle/order/infra/database/mongo/order/query/InAppPurchaseDetailsQuery.java index 11041bff..9a8853a3 100644 --- a/rc-service/rc-service-order/order-infrastructure/src/main/java/com/red/circle/order/infra/database/mongo/order/query/InAppPurchaseDetailsQuery.java +++ b/rc-service/rc-service-order/order-infrastructure/src/main/java/com/red/circle/order/infra/database/mongo/order/query/InAppPurchaseDetailsQuery.java @@ -4,6 +4,7 @@ import com.red.circle.order.inner.model.enums.inapp.InAppPurchaseReceiptType; import com.red.circle.order.inner.model.enums.inapp.InAppPurchaseStatus; import java.io.Serial; import java.io.Serializable; +import java.sql.Timestamp; import java.time.LocalDateTime; import lombok.Data; @@ -83,12 +84,12 @@ public class InAppPurchaseDetailsQuery implements Serializable { /** * 开始时间. */ - private LocalDateTime startTime; + private Long startTime; /** * 结束时间. */ - private LocalDateTime endTime; + private Long endTime; /** * 最后一条记录id.