From 55ba702c1df240929e68df3b42fa9cb0607378b8 Mon Sep 17 00:00:00 2001 From: doum <doum> Date: 星期一, 08 九月 2025 10:58:48 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1 --- server/services/src/main/java/com/doumee/service/business/impl/DiscountMemberServiceImpl.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/services/src/main/java/com/doumee/service/business/impl/DiscountMemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/DiscountMemberServiceImpl.java index cfad07b..479c726 100644 --- a/server/services/src/main/java/com/doumee/service/business/impl/DiscountMemberServiceImpl.java +++ b/server/services/src/main/java/com/doumee/service/business/impl/DiscountMemberServiceImpl.java @@ -144,8 +144,8 @@ .like(StringUtils.isNotBlank(model.getName()),DiscountMember::getName,model.getName()) .like(StringUtils.isNotBlank(model.getOpenid()),Member::getOpenid,model.getOpenid()) .eq(Objects.nonNull(model.getStatus()),DiscountMember::getStatus,model.getStatus()) - .ge(Objects.nonNull(model.getStartCreateDate()),DiscountMember::getCreateDate, Utils.Date.getStart(model.getStartCreateDate())) - .le(Objects.nonNull(model.getEndCreateDate()),DiscountMember::getCreateDate, Utils.Date.getStart(model.getEndCreateDate())) + .ge(Objects.nonNull(model.getStartCreateDate()),DiscountMember::getCreateDate, model.getStartCreateDate()) + .le(Objects.nonNull(model.getEndCreateDate()),DiscountMember::getCreateDate, model.getEndCreateDate()) .ne(DiscountMember::getStatus,Constants.TWO) .orderByDesc(DiscountMember::getCode); return PageData.from(discountMemberJoinMapper.selectJoinPage(page, DiscountMember.class,queryWrapper)); -- Gitblit v1.9.3