From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/StudentHonorServiceImpl.java | 54 ++++++++++++++++++++++++++----------------------------
1 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/StudentHonorServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/StudentHonorServiceImpl.java
index 8b5b7a9..60ec8c2 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/StudentHonorServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/StudentHonorServiceImpl.java
@@ -85,8 +85,8 @@
// voList.add(vo);
// });
// }
- Integer count1 =coursePackageClient.counts(stuId);
- if (count1>0){
+ Integer count1 = coursePackageClient.counts(stuId);
+ if (count1 > 0) {
GongVo vo = new GongVo();
vo.setMedalType(1);
vo.setMedalName("俱乐部之星");
@@ -94,7 +94,7 @@
}
Integer count2 = participantClient.counts(stuId);
- if (count2>0){
+ if (count2 > 0) {
GongVo vo = new GongVo();
vo.setMedalType(2);
vo.setMedalName("运动达人");
@@ -102,7 +102,7 @@
}
Integer count3 = siteClient.counts(student.getAppUserId());
- if (count3>0){
+ if (count3 > 0) {
GongVo vo = new GongVo();
vo.setMedalType(3);
vo.setMedalName("社区之王");
@@ -111,7 +111,7 @@
Integer count4 = coursePackageClient.counts1(stuId);
- if (count4>0){
+ if (count4 > 0) {
GongVo vo = new GongVo();
vo.setMedalType(4);
vo.setMedalName("深度玩家");
@@ -123,14 +123,13 @@
}
-
@Override
public List<StuMedalVo> queryHonorDetails(Integer stuId) {
List<StuMedalVo> studentHonors = new ArrayList<>();
// List<Integer> collect = studentHonors.stream().map(StudentHonor::getHonorRuleId).collect(Collectors.toList());
- Integer count1 =coursePackageClient.counts(stuId);
- if (count1>0){
+ Integer count1 = coursePackageClient.counts(stuId);
+ if (count1 > 0) {
StuMedalVo vo = new StuMedalVo();
vo.setMedalType(1);
vo.setMedalName("俱乐部之星");
@@ -139,12 +138,12 @@
integers.add(1);
integers.add(count1);
HonorRules honorRules = honorDeClient.getHonor(integers);
- if (count1<Integer.valueOf(honorRules.getCondition())){
- vo.setLevelNum(Integer.valueOf(honorRules.getLevel())-1);
+ if (count1 < Integer.valueOf(honorRules.getCondition())) {
+ vo.setLevelNum(Integer.valueOf(honorRules.getLevel()) - 1);
vo.setNextLevel(Integer.valueOf(honorRules.getLevel()));
- vo.setUpgradeConditions(String.valueOf(Integer.valueOf(honorRules.getCondition())-count1));
+ vo.setUpgradeConditions(String.valueOf(Integer.valueOf(honorRules.getCondition()) - count1));
vo.setIsTopLevel(0);
- }else {
+ } else {
vo.setIsTopLevel(1);
}
@@ -152,7 +151,7 @@
}
Integer count2 = participantClient.counts(stuId);
- if (count2>0){
+ if (count2 > 0) {
StuMedalVo vo = new StuMedalVo();
vo.setMedalType(2);
vo.setMedalName("运动达人");
@@ -161,12 +160,12 @@
integers.add(2);
integers.add(count2);
HonorRules honorRules = honorDeClient.getHonor(integers);
- if (count2<Integer.valueOf(honorRules.getCondition())){
- vo.setLevelNum(Integer.valueOf(honorRules.getLevel())-1);
+ if (count2 < Integer.valueOf(honorRules.getCondition())) {
+ vo.setLevelNum(Integer.valueOf(honorRules.getLevel()) - 1);
vo.setNextLevel(Integer.valueOf(honorRules.getLevel()));
- vo.setUpgradeConditions(String.valueOf(Integer.valueOf(honorRules.getCondition())-count2));
+ vo.setUpgradeConditions(String.valueOf(Integer.valueOf(honorRules.getCondition()) - count2));
vo.setIsTopLevel(0);
- }else {
+ } else {
vo.setIsTopLevel(1);
}
@@ -175,7 +174,7 @@
TStudent student = studentService.getById(stuId);
Integer count3 = siteClient.counts(student.getAppUserId());
- if (count3>0){
+ if (count3 > 0) {
StuMedalVo vo = new StuMedalVo();
vo.setMedalType(3);
vo.setMedalName("社区之王");
@@ -184,12 +183,12 @@
integers.add(3);
integers.add(count3);
HonorRules honorRules = honorDeClient.getHonor(integers);
- if (count3<Integer.valueOf(honorRules.getCondition())){
- vo.setLevelNum(Integer.valueOf(honorRules.getLevel())-1);
+ if (count3 < Integer.valueOf(honorRules.getCondition())) {
+ vo.setLevelNum(Integer.valueOf(honorRules.getLevel()) - 1);
vo.setNextLevel(Integer.valueOf(honorRules.getLevel()));
- vo.setUpgradeConditions(String.valueOf(Integer.valueOf(honorRules.getCondition())-count3));
+ vo.setUpgradeConditions(String.valueOf(Integer.valueOf(honorRules.getCondition()) - count3));
vo.setIsTopLevel(0);
- }else {
+ } else {
vo.setIsTopLevel(1);
}
@@ -198,7 +197,7 @@
Integer count4 = coursePackageClient.counts1(stuId);
- if (count4>0){
+ if (count4 > 0) {
StuMedalVo vo = new StuMedalVo();
vo.setMedalType(4);
vo.setMedalName("深度玩家");
@@ -207,18 +206,17 @@
integers.add(4);
integers.add(count4);
HonorRules honorRules = honorDeClient.getHonor(integers);
- if (count4<Integer.valueOf(honorRules.getCondition())){
- vo.setLevelNum(Integer.valueOf(honorRules.getLevel())-1);
+ if (count4 < Integer.valueOf(honorRules.getCondition())) {
+ vo.setLevelNum(Integer.valueOf(honorRules.getLevel()) - 1);
vo.setNextLevel(Integer.valueOf(honorRules.getLevel()));
- vo.setUpgradeConditions(String.valueOf(Integer.valueOf(honorRules.getCondition())-count4));
+ vo.setUpgradeConditions(String.valueOf(Integer.valueOf(honorRules.getCondition()) - count4));
vo.setIsTopLevel(0);
- }else {
+ } else {
vo.setIsTopLevel(1);
}
studentHonors.add(vo);
}
-
return studentHonors;
--
Gitblit v1.7.1