From a4db109df375182d7cf2c8b7edbb8d6dbf2bf0af Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Sun, 14 Jun 2026 09:49:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=AF=E4=BB=98=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=8E=92=E5=BA=8F=E4=B8=8D=E7=94=9F=E6=95=88?= =?UTF-8?q?,=20=E5=90=8C=E6=97=B6=E4=BF=AE=E5=A4=8D=20WechatMessageRecordS?= =?UTF-8?q?ervice=20=E4=B8=AD=E7=A1=AC=E7=BC=96=E7=A0=81=E5=88=97=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/dao/product/PayProductManager.java | 1 + .../service/WechatMessageRecordService.java | 26 +++++++++---------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/dao/product/PayProductManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/dao/product/PayProductManager.java index 07cb34661..81bcd9e00 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/dao/product/PayProductManager.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/dao/product/PayProductManager.java @@ -42,6 +42,7 @@ public class PayProductManager extends BaseManager public Page page(PageParam pageParam, PayProductQuery query) { Page mpPage = MpUtil.getMpPage(pageParam); QueryWrapper generator = QueryGenerator.generator(query); + generator.lambda().orderByAsc(PayProduct::getSortNo).orderByAsc(PayProduct::getId); return page(mpPage, generator); } } diff --git a/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/org/dromara/daxpay/platform/capability/wechat/message/service/WechatMessageRecordService.java b/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/org/dromara/daxpay/platform/capability/wechat/message/service/WechatMessageRecordService.java index ad71bdd08..ef2a1328e 100644 --- a/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/org/dromara/daxpay/platform/capability/wechat/message/service/WechatMessageRecordService.java +++ b/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/org/dromara/daxpay/platform/capability/wechat/message/service/WechatMessageRecordService.java @@ -8,7 +8,7 @@ import org.dromara.daxpay.platform.capability.wechat.message.param.UniformMessag import org.dromara.daxpay.platform.capability.wechat.message.result.MessageSendResult; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Lazy; @@ -74,29 +74,29 @@ public class WechatMessageRecordService { /// @param startTime 开始时间 /// @param endTime 结束时间 /// @return 消息记录列表 - public List queryRecords(String openId, String messageType, - String status, OffsetDateTime startTime, + public List queryRecords(String openId, String messageType, + String status, OffsetDateTime startTime, OffsetDateTime endTime) { - QueryWrapper wrapper = new QueryWrapper<>(); - + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (StrUtil.isNotBlank(openId)) { - wrapper.eq("open_id", openId); + wrapper.eq(WechatMessageRecord::getOpenId, openId); } if (StrUtil.isNotBlank(messageType)) { - wrapper.eq("message_type", messageType); + wrapper.eq(WechatMessageRecord::getMessageType, messageType); } if (StrUtil.isNotBlank(status)) { - wrapper.eq("status", status); + wrapper.eq(WechatMessageRecord::getStatus, status); } if (startTime != null) { - wrapper.ge("send_time", startTime); + wrapper.ge(WechatMessageRecord::getSendTime, startTime); } if (endTime != null) { - wrapper.le("send_time", endTime); + wrapper.le(WechatMessageRecord::getSendTime, endTime); } - - wrapper.orderByDesc("send_time"); - + + wrapper.orderByDesc(WechatMessageRecord::getSendTime); + return recordManager.findAll(wrapper); }