From 6f105527515f86f84a05937499bc084877186e73 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 24 十一月 2025 10:19:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java
index 6898ee3..068d2f4 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java
@@ -33,8 +33,10 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Arrays;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.stream.Collectors;
@Slf4j
@RestController
@@ -84,7 +86,34 @@
String userId = tokenService.getLoginUserApplet().getUserId();
Page<TCourseOrder> page = new Page<>(query.getPageNum(), query.getPageSize());
Page<TCourseOrder> courseOrderPage = courseOrderService.page(page, Wrappers.<TCourseOrder>lambdaQuery().eq(TCourseOrder::getAppUserId, userId).eq(Objects.nonNull(query.getPayStatus()),TCourseOrder::getPayStatus, query.getPayStatus()).orderByDesc(TCourseOrder::getCreateTime));
+ List<TCourseOrder> records = courseOrderPage.getRecords();
+ if(!records.isEmpty()){
+ List<String> courseIds = records.stream().map(TCourseOrder::getCourseId).collect(Collectors.toList());
+ List<TCourse> tCourses = courseService.listByIds(courseIds);
+ records.forEach(courseOrder -> {
+ tCourses.forEach(course -> {
+ if(course.getId().equals(courseOrder.getCourseId())){
+ courseOrder.setCourse(course);
+ }
+ });
+ });
+ }
+ courseOrderPage.setRecords(records);
return R.ok(courseOrderPage);
+ }
+
+ @GetMapping("/getCourseOrderDetail/{id}")
+ @ApiOperation(value = "课程模块--订单详情",response = TCourseOrder.class)
+ public R<TCourseOrder> getCourseOrderList(@PathVariable String id) {
+ String userId = tokenService.getLoginUserApplet().getUserId();
+ TCourseOrder courseOrder = courseOrderService.getById(id);
+ if(!courseOrder.getAppUserId().equals(userId)){
+ return R.fail("无权限");
+ }
+ String courseId = courseOrder.getCourseId();
+ TCourse course = courseService.getById(courseId);
+ courseOrder.setCourse(course);
+ return R.ok(courseOrder);
}
@PostMapping("/saveOrder")
@@ -104,8 +133,8 @@
courseOrder.setOrderNumber(OrderNos.getDid());
boolean save = courseOrderService.save(courseOrder);
if (save) {
- Map<String, Object> result = wxV3Pay.jsApi(courseOrder.getOrderNumber(), course.getCourseCost().multiply(BigDecimal.valueOf(100)).longValue(), appUser.getOpenId(),"购买课程","");
- return R.ok(result);
+// Map<String, Object> result = wxV3Pay.jsApi(courseOrder.getOrderNumber(), course.getCourseCost().multiply(BigDecimal.valueOf(100)).longValue(), appUser.getOpenId(),"购买课程","");
+ return R.ok();
}
Map<String, ? extends Object> maps =
--
Gitblit v1.7.1