From 1906d789eb2dfa6246f33ff87e218cdc50be8ca3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 11 九月 2024 17:02:42 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
index 42c336b..2ee9278 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
@@ -69,10 +69,9 @@
private TokenService tokenService;
@Override
- public PageInfo<ExchangeRecordVO> pagelist(ExchangeRecordGoodsQuery dto) {
+ public List<ExchangeRecordVO> pagelist(ExchangeRecordGoodsQuery dto) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- PageInfo<ExchangeRecordVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
- List<ExchangeRecordVO> list = this.baseMapper.pageList(pageInfo,dto);
+ List<ExchangeRecordVO> list = this.baseMapper.pageList(dto);
// 订单ids
StringBuilder stringBuilder = new StringBuilder();
for (ExchangeRecordVO exchangeRecordVO : list) {
@@ -120,7 +119,6 @@
}
}
}
-
// 去除最后一个字符
if (StringUtils.hasText(stringBuilder.toString())){
String string = stringBuilder.deleteCharAt(stringBuilder.length() - 1).toString();
@@ -130,9 +128,7 @@
list.get(i).setOrderId(data.get(i));
}
}
-
- pageInfo.setRecords(list);
- return pageInfo;
+ return list;
}
--
Gitblit v1.7.1