From 35c07cedf67346e9d79449ed185af39a567fa60b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 七月 2023 08:31:11 +0800
Subject: [PATCH] 更新部分功能接口
---
cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java | 66 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 20 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 205d703..2f7c1ea 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
@@ -5,9 +5,12 @@
import com.dsh.account.entity.TStudent;
import com.dsh.account.feignclient.competition.model.PurchaseRecordVo;
import com.dsh.account.model.vo.classDetails.classInsVo.*;
+import com.dsh.account.model.vo.commentDetail.StuCommentsVo;
+import com.dsh.account.model.vo.medalDetail.StuMedalVo;
+import com.dsh.account.model.vo.sourceDetail.CouponStuAvailableVo;
import com.dsh.account.model.vo.sourceDetail.CourseDetailsOfContinuationResp;
import com.dsh.account.model.vo.sourceDetail.RecordTimeRequest;
-import com.dsh.account.model.vo.sourceDetail.CouponStuAvailableVo;
+import com.dsh.account.service.EvaluateStudentService;
import com.dsh.account.service.TAppUserService;
import com.dsh.account.service.TStudentService;
import com.dsh.account.util.DateUtil;
@@ -45,6 +48,9 @@
private TAppUserService tappuService;
@Autowired
+ private EvaluateStudentService evalstuService;
+
+ @Autowired
private TokenUtil tokenUtil;
@@ -57,9 +63,9 @@
@ApiImplicitParam(value = "纬度值", name = "latitude", required = true, dataType = "String"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<ClassInfoVo> queryCouponRecord(@RequestBody String longitude, @RequestBody String latitude, HttpServletRequest request){
+ public ResultUtil<ClassInfoVo> queryCouponRecord(@RequestBody String longitude, @RequestBody String latitude){
try {
- Integer userIdFormRedis = tokenUtil.getUserIdFormRedis(request);
+ Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
if(null == userIdFormRedis){
return ResultUtil.tokenErr();
}
@@ -101,9 +107,9 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
@Transactional
- public ResultUtil addStu(@RequestBody StuDetailsReq stu,HttpServletRequest request){
+ public ResultUtil addStu(@RequestBody StuDetailsReq stu){
try {
- Integer userIdFormRedis = tokenUtil.getUserIdFormRedis(request);
+ Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
if(null == userIdFormRedis){
return ResultUtil.tokenErr();
}
@@ -123,9 +129,9 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<StuListVo>> queryStuList(HttpServletRequest request){
+ public ResultUtil<List<StuListVo>> queryStuList(){
try {
- Integer userIdFormRedis = tokenUtil.getUserIdFormRedis(request);
+ Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
if(null == userIdFormRedis){
return ResultUtil.tokenErr();
}
@@ -162,9 +168,9 @@
@ApiImplicitParam(value = "课包id", name = "lessonId", required = true, dataType = "int"),
@ApiImplicitParam(value = "学员id", name = "stuId", required = true, dataType = "int"),
})
- public ResultUtil<ClassDetailsInsVo> coursePackageDetails(@RequestBody Integer lessonId, @RequestBody Integer stuId, HttpServletRequest request){
+ public ResultUtil<ClassDetailsInsVo> coursePackageDetails(@RequestBody Integer lessonId, @RequestBody Integer stuId){
try {
- Integer userIdFormRedis = tokenUtil.getUserIdFormRedis(request);
+ Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
if(null == userIdFormRedis){
return ResultUtil.tokenErr();
}
@@ -187,9 +193,9 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
})
- public ResultUtil<List<PurchaseRecordVo>> recordList(@RequestBody RecordTimeRequest timeRequest, HttpServletRequest request){
+ public ResultUtil<List<PurchaseRecordVo>> recordList(@RequestBody RecordTimeRequest timeRequest){
try {
- Integer userIdFormRedis = tokenUtil.getUserIdFormRedis(request);
+ Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
if(null == userIdFormRedis){
return ResultUtil.tokenErr();
}
@@ -201,7 +207,7 @@
/**
- * 课时详情-续课
+ * 课时详情-续课课包详情
*/
@ResponseBody
@PostMapping("/base/startCource/renewal")
@@ -209,9 +215,9 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<CourseDetailsOfContinuationResp> renewalOfCourses(@RequestBody Integer lessonId, @RequestBody Integer stuId, HttpServletRequest request){
+ public ResultUtil<CourseDetailsOfContinuationResp> renewalOfCourses(@RequestBody Integer lessonId, @RequestBody Integer stuId){
try {
- Integer userIdFormRedis = tokenUtil.getUserIdFormRedis(request);
+ Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
if(null == userIdFormRedis){
return ResultUtil.tokenErr();
}
@@ -224,7 +230,7 @@
/**
- * 课时详情-续课
+ * 课时详情-选择优惠券
*/
@ResponseBody
@PostMapping("/base/startCource/conponList")
@@ -232,9 +238,9 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<CouponStuAvailableVo>> queryCouponList(HttpServletRequest request){
+ public ResultUtil<List<CouponStuAvailableVo>> queryCouponList(){
try {
- Integer userIdFormRedis = tokenUtil.getUserIdFormRedis(request);
+ Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
if(null == userIdFormRedis){
return ResultUtil.tokenErr();
}
@@ -248,7 +254,7 @@
/**
- * 课时详情-续课
+ * 课时详情-支付
*/
@ResponseBody
@PostMapping("/base/startCource/payment")
@@ -276,16 +282,36 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<?> queryStuComment(@RequestParam("stuId") Integer stuId, HttpServletRequest request){
+ public ResultUtil<List<StuCommentsVo>> queryStuComment(@RequestParam("stuId") Integer stuId){
try {
+ return ResultUtil.success(evalstuService.queryStuCommentsList(stuId));
+ }catch (Exception e){
+ return ResultUtil.runErr();
+ }
+ }
+
+ /**
+ * 学员勋章
+ */
+ @ResponseBody
+ @PostMapping("/base/startCource/stuMedal")
+ @ApiOperation(value = "学员勋章", tags = {"APP-开始上课"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<StuMedalVo> queryStuMedal(@RequestParam("stuId") Integer stuId){
+ try {
+ Integer appUserId = tokenUtil.getUserIdFormRedis();
+ if(null == appUserId){
+ return ResultUtil.tokenErr();
+ }
return ResultUtil.success();
}catch (Exception e){
return ResultUtil.runErr();
}
}
-
}
--
Gitblit v1.7.1