pay/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay synced 2026-08-13 15:55:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 支付产品分页排序不生效, 同时修复 WechatMessageRecordService 中硬编码列名

Browse Source
This commit is contained in:
DaxPay Dev
2026-06-14 09:49:24 +08:00
parent c546859671
commit a4db109df3
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/dao/product/PayProductManager.java
View File

@@ -42,6 +42,7 @@ public class PayProductManager extends BaseManager<PayProductMapper, PayProduct>
public Page<PayProduct> page(PageParam pageParam, PayProductQuery query) {
Page<PayProduct> mpPage = MpUtil.getMpPage(pageParam);
QueryWrapper<PayProduct> generator = QueryGenerator.generator(query);
generator.lambda().orderByAsc(PayProduct::getSortNo).orderByAsc(PayProduct::getId);
return page(mpPage, generator);
}
}

26
daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/org/dromara/daxpay/platform/capability/wechat/message/service/WechatMessageRecordService.java
View File

@@ -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<WechatMessageRecord> queryRecords(String openId, String messageType,
String status, OffsetDateTime startTime,
public List<WechatMessageRecord> queryRecords(String openId, String messageType,
String status, OffsetDateTime startTime,
OffsetDateTime endTime) {
QueryWrapper<WechatMessageRecord> wrapper = new QueryWrapper<>();
LambdaQueryWrapper<WechatMessageRecord> 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);
}