From 4310c19a73f960dfd79c90cfe960cf564b068f72 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 26 May 2022 10:03:35 +0800
Subject: [PATCH] 1、资讯模糊匹配修改
---
src/main/java/org/springblade/modules/integral/controller/IntegralController.java | 21 ++++++++++++++++++---
1 files changed, 18 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 67474a2..b60be97 100644
--- a/src/main/java/org/springblade/modules/integral/controller/IntegralController.java
+++ b/src/main/java/org/springblade/modules/integral/controller/IntegralController.java
@@ -21,6 +21,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import io.swagger.models.auth.In;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
@@ -33,6 +34,9 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 控制器
@@ -130,9 +134,20 @@
* @return
*/
@PostMapping("/selectCount")
- public R selectCount(String uid) {
- return R.data(integralService.selectCount(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());
+ //总积分
+ map.put("zjf", list.get(0));
+ //总的用掉的积分
+ map.put("yjf", list.get(1));
+ //剩余积分
+ map.put("sjf", a - b);
+ map.put("list",listAll);
+ return R.data(map);
}
-
}
--
Gitblit v1.9.3