From 4fd57c9e370cd80d2df7dafd958521e304f9c3fc Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 09 八月 2023 09:32:22 +0800
Subject: [PATCH] 后台代码
---
cloud-server-account/src/main/java/com/dsh/account/mapper/UserIntegralChangesMapper.java | 2 +-
cloud-server-account/src/main/java/com/dsh/account/controller/UserIntegralChangesController.java | 6 +++---
cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java | 6 +++---
cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/UserIntegralChangesController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/UserIntegralChangesController.java
index 6616844..1cdcf70 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/UserIntegralChangesController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/UserIntegralChangesController.java
@@ -39,15 +39,15 @@
}
@PostMapping("/userIntegralChanges/list")
- public List<UserIntegral> list(@RequestBody IntegralListQuery integralListQuery){
+ public Page<UserIntegral> list(@RequestBody IntegralListQuery integralListQuery){
try {
Page<UserIntegral> userIntegralPage = new Page<>(integralListQuery.getOffset(), integralListQuery.getLimit());
- List<UserIntegral> list = userIntegralChangesService.listAll(userIntegralPage,integralListQuery);
+ Page<UserIntegral> list = userIntegralChangesService.listAll(userIntegralPage,integralListQuery);
return list;
}catch (Exception e){
e.printStackTrace();
- return new ArrayList<>();
+ return new Page<>();
}
}
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/mapper/UserIntegralChangesMapper.java b/cloud-server-account/src/main/java/com/dsh/account/mapper/UserIntegralChangesMapper.java
index a4046ad..9e948af 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/mapper/UserIntegralChangesMapper.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/mapper/UserIntegralChangesMapper.java
@@ -19,5 +19,5 @@
*/
public interface UserIntegralChangesMapper extends BaseMapper<UserIntegralChanges> {
- List<UserIntegral> listAll(@Param("userIntegralPage") Page<UserIntegral> userIntegralPage, @Param("query") IntegralListQuery integralListQuery, @Param("sTime") String sTime, @Param("eTime") String eTime);
+ Page<UserIntegral> listAll(@Param("userIntegralPage") Page<UserIntegral> userIntegralPage, @Param("query") IntegralListQuery integralListQuery, @Param("sTime") String sTime, @Param("eTime") String eTime);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java b/cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java
index 3d4da18..4943df0 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java
@@ -37,7 +37,7 @@
PointDetailsVo queryRedemptionDetails(Integer detailsId);
- List<UserIntegral> listAll(Page<UserIntegral> userIntegralPage, IntegralListQuery integralListQuery);
+ Page<UserIntegral> listAll(Page<UserIntegral> userIntegralPage, IntegralListQuery integralListQuery);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java
index 238dd4d..46a22c8 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java
@@ -145,15 +145,15 @@
}
@Override
- public List<UserIntegral> listAll(Page<UserIntegral> userIntegralPage, IntegralListQuery integralListQuery) {
+ public Page<UserIntegral> listAll(Page<UserIntegral> userIntegralPage, IntegralListQuery integralListQuery) {
String sTime =null;
String eTime =null;
if(ToolUtil.isNotEmpty(integralListQuery.getTime())){
sTime = integralListQuery.getTime().split(" - ")[0]+" 00:00:00";
eTime = integralListQuery.getTime().split(" - ")[1]+" 23:59:59";
}
- List<UserIntegral> userIntegrals = this.baseMapper.listAll(userIntegralPage, integralListQuery, sTime, eTime);
- for (UserIntegral userIntegral : userIntegrals) {
+ Page<UserIntegral> userIntegrals = this.baseMapper.listAll(userIntegralPage, integralListQuery, sTime, eTime);
+ for (UserIntegral userIntegral : userIntegrals.getRecords()) {
if(userIntegral.getCategory()==1){
userIntegral.setIntegral(userIntegral.getNewIntegral()-userIntegral.getOldIntegral());
}else {
--
Gitblit v1.7.1