From b0254c5a17b3915eb00fdcb33f0eea222cff78ee Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 06 三月 2024 15:06:54 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java | 8 ++------
1 files changed, 2 insertions(+), 6 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 7d92af3..8ad6497 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"),
@@ -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
@@ -575,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();
}
--
Gitblit v1.7.1