From 6593a67fdfb688c70365b419c0e9658c690524b5 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 16 十月 2023 09:50:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java |   72 ++++++++++++++++++++++++++++++------
 1 files changed, 60 insertions(+), 12 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 fa41b2b..4488bd8 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
@@ -5,19 +5,13 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.entity.TCourse;
-import com.dsh.course.entity.TCoursePackage;
-import com.dsh.course.entity.TCoursePackagePayment;
-import com.dsh.course.entity.TCoursePackageType;
+import com.dsh.course.entity.*;
 import com.dsh.course.feignclient.model.ExerciseVideo;
 import com.dsh.course.model.*;
 import com.dsh.course.model.dto.CourseChangeStateDTO;
 import com.dsh.course.model.dto.TQueryBenefitsVideosDTO;
 import com.dsh.course.model.vo.TQueryBenefitsVideosVO;
-import com.dsh.course.service.TCoursePackagePaymentService;
-import com.dsh.course.service.TCoursePackageService;
-import com.dsh.course.service.TCoursePackageTypeService;
-import com.dsh.course.service.TCourseService;
+import com.dsh.course.service.*;
 import com.dsh.course.util.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -33,10 +27,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.PrintWriter;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Api
@@ -64,6 +55,9 @@
 
     @Autowired
     private TCoursePackagePaymentService coursePackagePaymentService;
+
+    @Autowired
+    private TCoursePackageDiscountService discountService;
 
     /**
      * 上/下架 1为上架 2为下架 3为删除
@@ -377,6 +371,8 @@
     @ResponseBody
     @PostMapping("/course/addCourse")
     public void addCourse(@RequestBody TCourse course){
+        course.setState(1);
+        course.setInsertTime(new Date());
         courseService.save(course);
     }
 
@@ -451,6 +447,58 @@
         return coursePackageService.getHours(coursePackageId1);
     }
 
+    @PostMapping("/course/queryByDiscountId")
+    public TCoursePackage queryByDiscountId(@RequestBody Integer id){
+        TCoursePackageDiscount byId = discountService.getById(id);
+        TCoursePackage byId1 = coursePackageService.getById(byId.getCoursePackageId());
+        return byId1;
+    }
+    @ResponseBody
+    @PostMapping("/course/queryByDiscountId1")
+    public TCoursePackage queryByDiscountId1(@RequestBody Integer id){
+        TCoursePackageDiscount byId = discountService.getById(id);
+        TCoursePackage byId1 = coursePackageService.getById(byId.getCoursePackageId());
+        return byId1;
+    }
+
+
+    @PostMapping("/course/queryDiscountById")
+    public Integer queryDiscountById(@RequestBody Integer id){
+        TCoursePackageDiscount byId = discountService.getById(id);
+        return byId.getAuditStatus();
+    }
+    @PostMapping("/course/queryDiscountList")
+    public List<DiscountList> queryDiscountList(@RequestBody  QueryDiscountList queryDiscountList){
+        return discountService.queryDiscountList(queryDiscountList);
+    }
+
+    @PostMapping("/course/queryDiscountListAudit")
+    public List<DiscountList> queryDiscountListAudit(@RequestBody  QueryDiscountList queryDiscountList){
+        return discountService.queryDiscountListAudit(queryDiscountList);
+    }
+
+
+    @PostMapping("/course/updateState")
+    public Boolean updateState( @RequestBody DiscountUpdateState discountUpdateState){
+        TCoursePackageDiscount byId = discountService.getById(discountUpdateState.getId());
+        List<TCoursePackageDiscount> list = discountService.list(new LambdaQueryWrapper<TCoursePackageDiscount>().eq(TCoursePackageDiscount::getCoursePackageId, byId.getCoursePackageId()));
+        list.forEach(e->e.setStatus(discountUpdateState.getStatus()));
+        return discountService.updateBatchById(list);
+    }
+
+
+    @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()));
+        for (TCoursePackageDiscount tCoursePackageDiscount : list) {
+            tCoursePackageDiscount.setAuditStatus(auditDiscount.getType());
+            tCoursePackageDiscount.setAuditRemark(auditDiscount.getText());
+        }
+
+        return discountService.updateBatchById(list);
+    }
+
     @PostMapping("/course/queryFee")
     public  HashMap<String, Object> queryFee(@RequestBody QueryDataFee queryDataFee){
         HashMap<String, Object> map = new HashMap<>();

--
Gitblit v1.7.1