hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单详情 日期查询报错修复

Browse Source
This commit is contained in:
tianfeng 2026-02-28 15:01:40 +08:00
parent 97c84fc975
commit 62cb54c94a
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rc-service/rc-inner-api/order-inner/order-inner-model/src/main/java/com/red/circle/order/inner/model/cmd/inapp/InAppPurchaseDetailsQryCmd.java
View File

@ -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.InAppPurchaseReceiptType;
import com.red.circle.order.inner.model.enums.inapp.InAppPurchaseStatus; import com.red.circle.order.inner.model.enums.inapp.InAppPurchaseStatus;
import java.io.Serial; import java.io.Serial;
import java.sql.Timestamp;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; 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. * 最后一条记录id.

14
rc-service/rc-service-order/order-infrastructure/src/main/java/com/red/circle/order/infra/database/mongo/order/impl/InAppPurchaseDetailsServiceImpl.java
View File

@ -15,11 +15,7 @@ import com.red.circle.tool.core.date.TimestampUtils;
import com.red.circle.tool.core.text.StringUtils; import com.red.circle.tool.core.text.StringUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Arrays; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort;
@ -202,8 +198,8 @@ public class InAppPurchaseDetailsServiceImpl implements InAppPurchaseDetailsServ
if (Objects.nonNull(query.getStartTime()) && Objects.nonNull(query.getEndTime())) { if (Objects.nonNull(query.getStartTime()) && Objects.nonNull(query.getEndTime())) {
criteria.andOperator( criteria.andOperator(
Criteria.where("createTime").gte(query.getStartTime()), Criteria.where("createTime").gte(new Date(query.getStartTime())),
Criteria.where("createTime").lte(query.getEndTime()) 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())) { if (Objects.nonNull(query.getStartTime()) && Objects.nonNull(query.getEndTime())) {
criteria.andOperator( criteria.andOperator(
Criteria.where("createTime").gte(query.getStartTime()), Criteria.where("createTime").gte(new Date(query.getStartTime())),
Criteria.where("createTime").lte(query.getEndTime()) Criteria.where("createTime").lte(new Date(query.getEndTime()))
); );
} }

5
rc-service/rc-service-order/order-infrastructure/src/main/java/com/red/circle/order/infra/database/mongo/order/query/InAppPurchaseDetailsQuery.java
View File

@ -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 com.red.circle.order.inner.model.enums.inapp.InAppPurchaseStatus;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.sql.Timestamp;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.Data; 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. * 最后一条记录id.