From 53c9049089aac8d5e9f21c89ab62a2d85771973f Mon Sep 17 00:00:00 2001
From: lisy <java@lishouyideAir.lan>
Date: 星期一, 19 六月 2023 09:03:37 +0800
Subject: [PATCH] 课程信息:列表展示

---
 cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index b240beb..d5fb9e5 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -5,16 +5,13 @@
 import com.dsh.course.entity.TCoursePackagePayment;
 import com.dsh.course.feignclient.model.CourseOfStoreVo;
 import com.dsh.course.feignclient.model.StuCourseResp;
+import com.dsh.course.service.TCoursePackagePaymentService;
 import com.dsh.course.service.TCoursePackageService;
-import com.dsh.course.servs.CoursePackagePaymentRepository;
 import io.swagger.annotations.Api;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,8 +24,9 @@
 
     private Logger logger = LoggerFactory.getLogger("business-log");
 
+
     @Autowired
-    private CoursePackagePaymentRepository coursePackagePaymentRepository;
+    private TCoursePackagePaymentService packagePaymentService;
 
     @Autowired
     private TCoursePackageService tcpService;
@@ -39,9 +37,9 @@
      * @return  课包列表
      */
     @PostMapping("/coursePack/queryPayment")
-    public List<StuCourseResp> getStuCoursePackagePayment(Integer stuId){
+    public List<StuCourseResp> getStuCoursePackagePayment(@RequestBody Integer stuId){
         List<StuCourseResp> resps = new ArrayList<>();
-        List<TCoursePackagePayment> byUserId = coursePackagePaymentRepository.findByUserId(stuId);
+        List<TCoursePackagePayment> byUserId = packagePaymentService.queryAllCoursePackage(stuId);
         if (byUserId.size() > 0 ){
             for (TCoursePackagePayment tCoursePackagePayment : byUserId) {
                 TCoursePackage tCoursePackage = tcpService.getById(tCoursePackagePayment.getCoursePackageId());
@@ -51,6 +49,7 @@
                 resp.setTotalCourseNums(tCoursePackagePayment.getTotalClassHours());
                 resp.setResidueNums(tCoursePackagePayment.getLaveClassHours());
                 resp.setDeductionNums(tCoursePackagePayment.getTotalClassHours()-tCoursePackagePayment.getLaveClassHours());
+                resps.add(resp);
             }
         }
         return resps;
@@ -62,6 +61,18 @@
      */
     @PostMapping("/coursePack/storeOfCourse")
     public List<CourseOfStoreVo> getStuCourseWithStores(){
+        List<CourseOfStoreVo> courseOfStoreVos = tcpService.queryStoreOfCourse();
+        if (courseOfStoreVos.size() > 0){
+            for (CourseOfStoreVo courseOfStoreVo : courseOfStoreVos) {
+                String[] split = courseOfStoreVo.getClassWeeks().split(";");
+                List<Integer> integers = new ArrayList<>();
+                for (String s : split) {
+                    int num = Integer.parseInt(s);
+                    integers.add(num);
+                }
+                courseOfStoreVo.setClassWeekList(integers);
+            }
+        }
         return tcpService.queryStoreOfCourse();
     }
 

--
Gitblit v1.7.1