From e631f307d90aadf6e20d40d0d30a5f29d4b0767f Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 18 三月 2024 16:04:11 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageOrderStudentController.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageOrderStudentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageOrderStudentController.java
index 61dc217..e66bd55 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageOrderStudentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageOrderStudentController.java
@@ -1,8 +1,10 @@
package com.dsh.course.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dsh.course.entity.CoursePackageOrder;
import com.dsh.course.entity.CoursePackageOrderStudent;
import com.dsh.course.model.DeductionClassHourList;
+import com.dsh.course.service.ICoursePackageOrderService;
import com.dsh.course.service.ICoursePackageOrderStudentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -20,9 +22,15 @@
@Autowired
private ICoursePackageOrderStudentService coursePackageOrderStudentService;
+ @Autowired
+ private ICoursePackageOrderService coursePackageOrderService;
+
+
+
+
/**
- * 根据学院id获取剩余有效课时数据
+ * 根据学员id获取剩余有效课时数据
* @param studentId
* @return
*/
@@ -35,6 +43,21 @@
}
+
+ /**
+ * 根据用户id获取剩余有效课时数据
+ * @param appUserId
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/getCoursePackageOrderUser")
+ public List<CoursePackageOrderStudent> getCoursePackageOrderUser(@RequestBody Integer appUserId){
+ return coursePackageOrderStudentService.list(new QueryWrapper<CoursePackageOrderStudent>()
+ .eq("appUserId", appUserId).eq("status", 1).eq("state", 1)
+ .gt("laveClassHours", 0).last(" and useTime > now() order by insertTime"));
+ }
+
+
/**
* 扣减学员课时
* @param deductionClassHourList
@@ -42,7 +65,18 @@
*/
@ResponseBody
@PostMapping("/deductionClassHour")
- public boolean deductionClassHour(@RequestBody DeductionClassHourList deductionClassHourList){
+ public DeductionClassHourList deductionClassHour(@RequestBody DeductionClassHourList deductionClassHourList){
return coursePackageOrderStudentService.deductionClassHour(deductionClassHourList);
}
+
+
+ /**
+ * 回退课时和回退排课数据
+ * @param deductionClassHourList
+ */
+ @ResponseBody
+ @PostMapping("/backspaceClassHour")
+ public void backspaceClassHour(@RequestBody DeductionClassHourList deductionClassHourList){
+ coursePackageOrderStudentService.backspaceClassHour(deductionClassHourList);
+ }
}
--
Gitblit v1.7.1