From 1863e6353f0de84082a21738f5d0a28f3cfeadc0 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 十一月 2023 19:33:49 +0800
Subject: [PATCH] 后台bug修改

---
 cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java |   30 +++++++++++++++++++++++-------
 1 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
index df01a7d..aca0e77 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
@@ -6,6 +6,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dsh.course.entity.*;
+import com.dsh.course.entity.dto.SelectDto;
 import com.dsh.course.feignclient.model.ExerciseVideo;
 import com.dsh.course.model.*;
 import com.dsh.course.model.dto.CourseChangeStateDTO;
@@ -58,6 +59,8 @@
 
     @Autowired
     private TCoursePackageDiscountService discountService;
+    @Autowired
+    private ICoursePackagePaymentConfigService coursePackagePaymentConfigService;
 
     /**
      * 上/下架 1为上架 2为下架 3为删除
@@ -288,6 +291,7 @@
                     for (TCoursePackagePayment coursePackagePayment : list) {
                         coursePackagePayment.setPayStatus(2);
                         coursePackagePayment.setOrderNumber(trade_no);
+                        coursePackagePayment.setAppUserId(null);
                     }
                     coursePackagePaymentService.updateBatchById(list);
                 }
@@ -449,9 +453,16 @@
         return strings;
 
     }
-
+    // 获取课包商品的价格配置
+    @PostMapping("/course/getHoursByPackageId")
+    @ResponseBody
+    public List<CoursePackagePaymentConfig> getHoursByPackageId(@RequestBody Integer coursePackageId1){
+        List<CoursePackagePaymentConfig> coursePackageId = coursePackagePaymentConfigService.list(new QueryWrapper<CoursePackagePaymentConfig>()
+                .eq("coursePackageId", coursePackageId1));
+        return coursePackageId;
+    }
     @PostMapping("/course/getHours")
-    public String getHours(@RequestBody Integer coursePackageId1){
+    public List<Integer> getHours(@RequestBody Integer coursePackageId1){
         return coursePackageService.getHours(coursePackageId1);
     }
 
@@ -497,8 +508,9 @@
 
     @PostMapping("/course/auditDiscount")
     public Boolean auditDiscount( @RequestBody AuditDiscount auditDiscount){
-        TCoursePackageDiscount byId = discountService.getById(auditDiscount.getId());
-        List<TCoursePackageDiscount> list = discountService.list(new LambdaQueryWrapper<TCoursePackageDiscount>().eq(TCoursePackageDiscount::getCoursePackageId, byId.getCoursePackageId()));
+
+        List<TCoursePackageDiscount> list = discountService.list(new LambdaQueryWrapper<TCoursePackageDiscount>()
+                .eq(TCoursePackageDiscount::getCoursePackageId, auditDiscount.getId()));
         for (TCoursePackageDiscount tCoursePackageDiscount : list) {
             tCoursePackageDiscount.setAuditStatus(auditDiscount.getType());
             tCoursePackageDiscount.setAuditRemark(auditDiscount.getText());
@@ -509,11 +521,15 @@
     @Autowired
     private ICoursePackagePaymentConfigService packagePaymentConfigService;
     @PostMapping("/course/times")
-    public List<Integer> times( @RequestBody Integer oneId){
+    public List<SelectDto> times(@RequestBody Integer oneId){
         List<CoursePackagePaymentConfig> list = packagePaymentConfigService.list(new QueryWrapper<CoursePackagePaymentConfig>().eq("coursePackageId",oneId));
-        List<Integer> integerList = new ArrayList<>();
+        List<SelectDto> integerList = new ArrayList<>();
         for (CoursePackagePaymentConfig coursePackagePaymentConfig : list) {
-            integerList.add(coursePackagePaymentConfig.getClassHours());
+//            integerList.add(coursePackagePaymentConfig.getClassHours());
+            SelectDto selectDto = new SelectDto();
+            selectDto.setId(coursePackagePaymentConfig.getId());
+            selectDto.setValue(String.valueOf(coursePackagePaymentConfig.getClassHours()));
+            integerList.add(selectDto);
         }
 
 

--
Gitblit v1.7.1