From 7cb90b47c42b4ee5944964ad62ae89e7e6a2f9ca Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 十一月 2023 09:03:36 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 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 e4b4470..71f86ba 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;
@@ -27,10 +28,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
@@ -70,7 +68,6 @@
@RequestMapping("/base/course/changeState")
@ResponseBody
public Object changeState(@RequestBody CourseChangeStateDTO dto){
-
return courseService.changeState(dto);
}
@@ -280,6 +277,7 @@
@PostMapping("/base/course/aliPaymentCourseCallback")
public void aliPaymentCourseCallback(HttpServletRequest request, HttpServletResponse response){
try {
+ System.err.println("=====支付宝回调=======");
Map<String, String> map = payMoneyUtil.alipayCallback(request);
if(null != map){
String code = map.get("out_trade_no");
@@ -302,6 +300,14 @@
}catch (Exception e){
e.printStackTrace();
}
+ }
+
+
+ //分账
+ public void moneyOut(){
+
+
+
}
@@ -374,6 +380,8 @@
@ResponseBody
@PostMapping("/course/addCourse")
public void addCourse(@RequestBody TCourse course){
+ course.setState(1);
+ course.setInsertTime(new Date());
courseService.save(course);
}
@@ -444,7 +452,7 @@
}
@PostMapping("/course/getHours")
- public String getHours(@RequestBody Integer coursePackageId1){
+ public List<Integer> getHours(@RequestBody Integer coursePackageId1){
return coursePackageService.getHours(coursePackageId1);
}
@@ -490,8 +498,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());
@@ -499,6 +508,23 @@
return discountService.updateBatchById(list);
}
+ @Autowired
+ private ICoursePackagePaymentConfigService packagePaymentConfigService;
+ @PostMapping("/course/times")
+ public List<SelectDto> times(@RequestBody Integer oneId){
+ List<CoursePackagePaymentConfig> list = packagePaymentConfigService.list(new QueryWrapper<CoursePackagePaymentConfig>().eq("coursePackageId",oneId));
+ List<SelectDto> integerList = new ArrayList<>();
+ for (CoursePackagePaymentConfig coursePackagePaymentConfig : list) {
+// integerList.add(coursePackagePaymentConfig.getClassHours());
+ SelectDto selectDto = new SelectDto();
+ selectDto.setId(coursePackagePaymentConfig.getId());
+ selectDto.setValue(String.valueOf(coursePackagePaymentConfig.getClassHours()));
+ integerList.add(selectDto);
+ }
+
+
+ return integerList;
+ }
@PostMapping("/course/queryFee")
public HashMap<String, Object> queryFee(@RequestBody QueryDataFee queryDataFee){
--
Gitblit v1.7.1