From b23b243473fc9ab20ca62eebf3668c143e2e7d23 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 15:30:53 +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 | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 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 95d9604..c3b57d9 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
@@ -109,7 +109,7 @@
@ResponseBody
@PostMapping("/api/startCource/weeksOfCourseDetailsList")
- @ApiOperation(value = "上课首页-课程列表2.0", tags = {"APP-开始上课"})
+ @ApiOperation(value = "上课首页-课程列表", tags = {"APP-开始上课"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@ApiImplicitParam(value = "查询时间yyyy-MM-dd", name = "time", required = true, dataType = "string"),
@@ -143,9 +143,12 @@
if (null == appUserId) {
return ResultUtil.tokenErr();
}
- TAppGift one = appGiftService.getOne(new LambdaQueryWrapper<TAppGift>().eq(TAppGift::getUserId, appUserId));
-
- return ResultUtil.success(one == null ? 0 : one.getNum());
+ Integer num = 0;
+ List<TAppGift> list = appGiftService.list(new LambdaQueryWrapper<TAppGift>().eq(TAppGift::getUserId, appUserId));
+ for (TAppGift tAppGift : list) {
+ num += tAppGift.getNum();
+ }
+ return ResultUtil.success(num);
} catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
@@ -167,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
@@ -379,8 +380,6 @@
}
return ResultUtil.success(istuService.updateById(tStudent));
-
-// return ResultUtil.success(istuService.commitEditStudentInfo(stu,userIdFormRedis));
} catch (Exception e) {
return ResultUtil.runErr();
}
@@ -574,13 +573,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();
}
@@ -603,7 +600,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