From 83070ae1b6c99bff833b9a43910b58b970037383 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 03 四月 2025 14:40:25 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
index 7eeb799..8aca9b6 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
@@ -170,11 +170,9 @@
return ResultUtil.tokenErr();
}
TAppGift one = appGiftService.getOne(new LambdaQueryWrapper<TAppGift>().eq(TAppGift::getUserId, appUserId));
- Boolean b = false;
Integer i = 0;
if (one != null && one.getNum() > 0) {
i = appGiftService.weeksOfAddHours(packetId, appUserId, one.getNum());
-
}
if (i == 1) {
// 送完清0
@@ -264,7 +262,12 @@
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
vo.setBirthday(simpleDateFormat.format(sts.getBirthday()));
vo.setStuName(sts.getName());
- vo.setStuAge(DateUtil.age(sts.getBirthday()));
+ if (sts.getBirthday()!=null){
+ vo.setStuAge(DateUtil.age(sts.getBirthday()));
+
+ }else{
+ vo.setStuAge(18);
+ }
vo.setStuHeight(sts.getHeight());
vo.setStuWeight(sts.getWeight());
vo.setIsNot(sts.getIsDefault());
@@ -575,13 +578,11 @@
})
public ResultUtil<List<StuMedalVo>> queryStuMedal(Integer stuId) {
try {
-
-
Integer appUserId = tokenUtil.getUserIdFormRedis();
if (null == appUserId) {
return ResultUtil.tokenErr();
}
- return ResultUtil.success(honorService.queryHonorDetails(stuId));
+ return ResultUtil.success(honorService.queryHonorDetails(appUserId));
} catch (Exception e) {
return ResultUtil.runErr();
}
@@ -604,7 +605,7 @@
if (null == appUserId) {
return ResultUtil.tokenErr();
}
- return ResultUtil.success(honorService.queryStuOfMedalData(stuId));
+ return ResultUtil.success(honorService.queryStuOfMedalData(stuId, appUserId));
} catch (Exception e) {
return ResultUtil.runErr();
}
--
Gitblit v1.7.1