From c036557db88c6297b9a626a892dce35c14ab8ee5 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 09 十一月 2023 18:30:31 +0800
Subject: [PATCH] 11.6
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 10eb06d..25c7c31 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;
@@ -67,7 +68,6 @@
@RequestMapping("/base/course/changeState")
@ResponseBody
public Object changeState(@RequestBody CourseChangeStateDTO dto){
-
return courseService.changeState(dto);
}
@@ -277,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");
@@ -451,7 +452,7 @@
}
@PostMapping("/course/getHours")
- public String getHours(@RequestBody Integer coursePackageId1){
+ public Integer getHours(@RequestBody Integer coursePackageId1){
return coursePackageService.getHours(coursePackageId1);
}
@@ -509,11 +510,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