From 4146ce356365a67fec0509d64ebcf52f74c7ade9 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 27 九月 2023 11:25:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java | 103 +++++++++++----------------------------------------
1 files changed, 23 insertions(+), 80 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 d23a26e..337f37d 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,7 +5,10 @@
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.*;
+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.feignclient.model.ExerciseVideo;
import com.dsh.course.model.*;
import com.dsh.course.model.dto.CourseChangeStateDTO;
@@ -15,7 +18,6 @@
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.PageFactory;
import com.dsh.course.util.PayMoneyUtil;
import com.dsh.course.util.ResultUtil;
@@ -64,8 +66,6 @@
@Autowired
private TCoursePackagePaymentService coursePackagePaymentService;
- @Autowired
- private TCoursePackageDiscountService discountService;
/**
* 上/下架 1为上架 2为下架 3为删除
*
@@ -74,9 +74,6 @@
@RequestMapping("/base/course/changeState")
@ResponseBody
public Object changeState(@RequestBody CourseChangeStateDTO dto){
-
-
-
return courseService.changeState(dto);
}
@@ -173,6 +170,7 @@
+
@ResponseBody
@PostMapping("/api/course/queryCourseInfo")
@ApiOperation(value = "获取课程详情", tags = {"APP-课程列表"})
@@ -199,7 +197,6 @@
-
@ResponseBody
@PostMapping("/api/course/paymentCourse")
@ApiOperation(value = "支付课程", tags = {"APP-课程列表"})
@@ -211,6 +208,10 @@
Integer uid = tokenUtil.getUserIdFormRedis();
if(null == uid){
return ResultUtil.tokenErr();
+ }
+ Long couponId = paymentCourseVo.getCouponId();
+ if(couponId==null || couponId==0){
+ paymentCourseVo.setCouponId(null);
}
return coursePackageService.paymentCourse(uid, paymentCourseVo);
}catch (Exception e){
@@ -238,7 +239,6 @@
return ResultUtil.runErr();
}
}
-
/**
* 购买课程微信支付回调
@@ -343,6 +343,20 @@
}
+ @PostMapping("/course/getPageageType")
+ public List<Map<String, Object>> getPageageType(){
+ List<TCoursePackageType> list = coursePackageTypeService.list(new LambdaQueryWrapper<TCoursePackageType>().eq(TCoursePackageType::getState, 1));
+ ArrayList<Map<String, Object>> objects = new ArrayList<>();
+ for (TCoursePackageType tCoursePackageType : list) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("id",tCoursePackageType.getId());
+ map.put("name",tCoursePackageType.getName());
+ objects.add(map);
+ }
+ return objects;
+ }
+
+
/**
* 获取课程管理列表数据
* @param queryCourseList
@@ -418,77 +432,6 @@
@PostMapping("/course/queryCourseByType")
public List<TCourse> queryCourseByType(@RequestBody Integer type){
return courseService.list(new QueryWrapper<TCourse>().eq("type", type).eq("state", 1));
- }
-
-
- @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/queryByDiscountId")
- public TCoursePackage queryByDiscountId(@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/getPageageType")
- public List<Map<String, Object>> getPageageType(){
- List<TCoursePackageType> list = coursePackageTypeService.list(new LambdaQueryWrapper<TCoursePackageType>().eq(TCoursePackageType::getState, 1));
- ArrayList<Map<String, Object>> objects = new ArrayList<>();
- for (TCoursePackageType tCoursePackageType : list) {
- HashMap<String, Object> map = new HashMap<>();
- map.put("id",tCoursePackageType.getId());
- map.put("name",tCoursePackageType.getName());
- objects.add(map);
- }
- return objects;
- }
-
-
- @PostMapping("/course/queryByTypeId")
- public List<TCoursePackage> queryByTypeId(@RequestBody Integer oneId){
- return coursePackageService.list(new LambdaQueryWrapper<TCoursePackage>().eq(TCoursePackage::getCoursePackageTypeId,oneId).eq(TCoursePackage::getAuditStatus,2).eq(TCoursePackage::getState,1));
- }
-
-
- @PostMapping("/course/queryByConfigId")
- public List<Map<String, Object>> queryByConfigId(@RequestBody Integer oneId){
- return coursePackageService.queryByConfigId(oneId);
}
--
Gitblit v1.7.1