From 3af68ab1bdc20ead38c1521e7b48f32ca6aa2945 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 02 十二月 2025 10:45:47 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_community
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 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 bfa38b7..295aff5 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
@@ -85,7 +85,11 @@
public R<Page<TCourseOrder>> getCourseOrderList(@RequestBody CourseOrderListQuery query) {
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));
+ Page<TCourseOrder> courseOrderPage = courseOrderService.page(page, Wrappers.<TCourseOrder>lambdaQuery()
+ .eq(TCourseOrder::getAppUserId, userId)
+ .ne(TCourseOrder::getPayStatus, 4)
+ .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());
@@ -133,23 +137,21 @@
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, ? extends Object> maps =
+ new ImmutableMap.Builder<String, String>().
+ put("id", courseOrder.getId())
+ .build();
+ QuartzManager.addJob(
+ OrderJob.class,
+ (OrderJob.name+courseOrder.getId()).toUpperCase(),
+ TimeJobType.CANCEL_ORDER,
+ DateUtils.localDateTimeToDate(LocalDateTime.now().plusMinutes(15)),
+ maps
+ );
+// Map<String, Object> result = wxV3Pay.jsApi(courseOrder.getOrderNumber(), course.getCourseCost().multiply(BigDecimal.valueOf(100)).longValue(), appUser.getOpenId(),"购买课程","");
+// return R.ok(result);
+ return R.ok();
}
-
- Map<String, ? extends Object> maps =
- new ImmutableMap.Builder<String, String>().
- put("id", courseOrder.getId())
- .build();
- QuartzManager.addJob(
- OrderJob.class,
- (OrderJob.name+courseOrder.getId()).toUpperCase(),
- TimeJobType.CANCEL_ORDER,
- DateUtils.localDateTimeToDate(LocalDateTime.now().plusMinutes(15)),
- maps
- );
-
-
return R.fail("报名失败");
}
--
Gitblit v1.7.1