From f9aa2cf9f8671c38c06a4d58005031fa52d19166 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 27 十一月 2025 11:48:51 +0800
Subject: [PATCH] bug修改
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java | 7 ++++++-
ruoyi-system/src/main/java/com/ruoyi/system/model/TCourseOrder.java | 3 +--
2 files changed, 7 insertions(+), 3 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 28e31c8..91d117b 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,12 @@
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()
+ .and(e->e.ne(TCourseOrder::getPayStatus, 1)
+ .ge(TCourseOrder::getCreateTime, LocalDateTime.now().minusMinutes(15)))
+ .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());
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCourseOrder.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCourseOrder.java
index 616349a..6ac2f14 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCourseOrder.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCourseOrder.java
@@ -72,8 +72,7 @@
@TableField("id_card")
private String idCard;
- @ApiModelProperty(value = "支付状态 1=待支付 2=已支付 3=已退款 4=已取消 5=已完成 6退款中" +
- "")
+ @ApiModelProperty(value = "支付状态 1=待支付 2=已支付 3=已退款 4=已取消 5=已完成 6退款中")
@TableField("pay_status")
private Integer payStatus;
--
Gitblit v1.7.1