From cac5be41ea0bcc523360287a258501fcd59fdc72 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 16 Feb 2022 14:30:38 +0800
Subject: [PATCH] 问题修复
---
src/main/java/org/springblade/modules/integral/entity/Integral.java | 2 +-
src/main/java/org/springblade/modules/integral/controller/IntegralController.java | 4 +++-
src/main/java/org/springblade/modules/integral/service/impl/IntegralServiceImpl.java | 5 +++++
src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.java | 1 +
src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.xml | 13 ++++++++++++-
src/main/java/org/springblade/modules/integral/service/IIntegralService.java | 1 +
6 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/integral/controller/IntegralController.java b/src/main/java/org/springblade/modules/integral/controller/IntegralController.java
index f152785..b60be97 100644
--- a/src/main/java/org/springblade/modules/integral/controller/IntegralController.java
+++ b/src/main/java/org/springblade/modules/integral/controller/IntegralController.java
@@ -134,8 +134,9 @@
* @return
*/
@PostMapping("/selectCount")
- public R selectCount(String uid) {
+ public R selectCount(String uid,String type) {
List<Map<Object, Object>> list = integralService.selectCount(uid);
+ List<Map<Object, Object>> listAll = integralService.selectList(uid,type);
Map map = new HashMap();
Integer a = Integer.parseInt(list.get(0).get("integral").toString());
Integer b = Integer.parseInt(list.get(1).get("integral").toString());
@@ -145,6 +146,7 @@
map.put("yjf", list.get(1));
//剩余积分
map.put("sjf", a - b);
+ map.put("list",listAll);
return R.data(map);
}
diff --git a/src/main/java/org/springblade/modules/integral/entity/Integral.java b/src/main/java/org/springblade/modules/integral/entity/Integral.java
index 0686472..004feba 100644
--- a/src/main/java/org/springblade/modules/integral/entity/Integral.java
+++ b/src/main/java/org/springblade/modules/integral/entity/Integral.java
@@ -45,7 +45,7 @@
* 用户id
*/
@ApiModelProperty(value = "用户id")
- private Integer uid;
+ private Long uid;
/**
* 获取途径
*/
diff --git a/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.java b/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.java
index dee9173..74d91ef 100644
--- a/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.java
+++ b/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.java
@@ -41,4 +41,5 @@
*/
List<IntegralVO> selectIntegralPage(IPage page, IntegralVO integral);
List<Map<Object, Object>> selectCount(String uid);
+ List<Map<Object, Object>> selectList(String uid,String type);
}
diff --git a/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.xml b/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.xml
index 930d08a..6a5354a 100644
--- a/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.xml
+++ b/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.xml
@@ -15,7 +15,6 @@
<select id="selectIntegralPage" resultMap="integralResultMap">
select *
from sys_integral
- where is_deleted = 0
</select>
<select id="selectCount" resultType="java.util.HashMap">
@@ -27,5 +26,17 @@
FROM sys_integral
WHERE type = 2 AND uid=#{uid}
</select>
+ <select id="selectList" resultType="org.springblade.modules.integral.entity.Integral">
+ SELECT *
+ FROM sys_integral
+ WHERE uid=#{uid}
+ <if test="type == 2 ">
+ and type =1
+ </if>
+ <if test="type == 3 ">
+
+ and type =2
+ </if>
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/integral/service/IIntegralService.java b/src/main/java/org/springblade/modules/integral/service/IIntegralService.java
index 1c82deb..812a944 100644
--- a/src/main/java/org/springblade/modules/integral/service/IIntegralService.java
+++ b/src/main/java/org/springblade/modules/integral/service/IIntegralService.java
@@ -41,4 +41,5 @@
*/
IPage<IntegralVO> selectIntegralPage(IPage<IntegralVO> page, IntegralVO integral);
List<Map<Object, Object>> selectCount(String uid);
+ List<Map<Object, Object>> selectList(String uid,String type);
}
diff --git a/src/main/java/org/springblade/modules/integral/service/impl/IntegralServiceImpl.java b/src/main/java/org/springblade/modules/integral/service/impl/IntegralServiceImpl.java
index 88dcc01..750bd46 100644
--- a/src/main/java/org/springblade/modules/integral/service/impl/IntegralServiceImpl.java
+++ b/src/main/java/org/springblade/modules/integral/service/impl/IntegralServiceImpl.java
@@ -46,4 +46,9 @@
return baseMapper.selectCount(uid);
}
+ @Override
+ public List<Map<Object, Object>> selectList(String uid,String type) {
+ return baseMapper.selectList(uid,type);
+ }
+
}
--
Gitblit v1.9.3