From 62cd133e894d8cc8d527d5e94a4310794e03f763 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 14 Nov 2023 14:12:20 +0800
Subject: [PATCH] 试用期校验去除

---
 src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.xml |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

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 495b51a..964da1d 100644
--- a/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.xml
+++ b/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.xml
@@ -15,12 +15,34 @@
     <select id="selectIntegralPage" resultMap="integralResultMap">
         select *
         from sys_integral
-        where is_deleted = 0
     </select>
 
-    <select id="selectCount" resultType="java.lang.String">
+    <select id="selectCount" resultType="java.util.HashMap">
         SELECT COALESCE(sum(integral), 0) as integral
-        FROM sys_integral where  uid=#{uid}
+        FROM sys_integral
+        WHERE type = 1 AND uid=#{uid}
+        UNION ALL
+        SELECT COALESCE(sum(integral), 0) AS integral
+        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>
+    <select id="order" resultType="org.springblade.modules.integral.entity.Integral">
+        SELECT *
+        FROM sys_integral
+        ORDER BY integral DESC
+        LIMIT 0,10
     </select>
 
 </mapper>

--
Gitblit v1.9.3