From 5ca4dbed191c98f121b9d493d943e72ab8a3645e Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 29 十二月 2025 14:14:32 +0800
Subject: [PATCH] 文档调整
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 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 43cc43e..5e71224 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
@@ -1,23 +1,20 @@
package com.ruoyi.web.controller.api;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.collect.ImmutableMap;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.OrderNos;
import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.system.model.TAppUser;
import com.ruoyi.system.model.TCourse;
import com.ruoyi.system.model.TCourseOrder;
+import com.ruoyi.system.model.TInsuranceOrder;
import com.ruoyi.system.query.CourseOrderListQuery;
import com.ruoyi.system.query.GetCourseListQuery;
import com.ruoyi.system.service.TAppUserService;
import com.ruoyi.system.service.TCourseOrderService;
import com.ruoyi.system.service.TCourseService;
-import com.ruoyi.system.task.base.QuartzManager;
-import com.ruoyi.system.task.base.TimeJobType;
-import com.ruoyi.system.task.jobs.OrderJob;
+import com.ruoyi.system.service.TInsuranceOrderService;
import com.ruoyi.system.wxPay.model.WeixinPayProperties;
import com.ruoyi.system.wxPay.utils.WxRefundUtil;
import com.ruoyi.system.wxPay.utils.WxV3Pay;
@@ -28,6 +25,7 @@
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
@@ -47,14 +45,16 @@
private final WxV3Pay wxV3Pay;
private final WeixinPayProperties weixinPayProperties;
private final TAppUserService appUserService;
+ private final TInsuranceOrderService insuranceOrderService;
- public CourseController(TCourseService courseService, TCourseOrderService courseOrderService, TokenService tokenService, WxV3Pay wxV3Pay, WeixinPayProperties weixinPayProperties, TAppUserService appUserService) {
+ public CourseController(TCourseService courseService, TCourseOrderService courseOrderService, TokenService tokenService, WxV3Pay wxV3Pay, WeixinPayProperties weixinPayProperties, TAppUserService appUserService, TInsuranceOrderService insuranceOrderService) {
this.courseService = courseService;
this.courseOrderService = courseOrderService;
this.tokenService = tokenService;
this.wxV3Pay = wxV3Pay;
this.weixinPayProperties = weixinPayProperties;
this.appUserService = appUserService;
+ this.insuranceOrderService = insuranceOrderService;
}
@PostMapping("/getCourseList")
@@ -121,8 +121,18 @@
@ApiOperation(value = "课程模块--报名")
public R<Map<String, Object>> saveOrder(@RequestBody TCourseOrder courseOrder) {
String userId = tokenService.getLoginUserApplet().getUserId();
- TAppUser appUser = appUserService.getById(userId);
+// TAppUser appUser = appUserService.getById(userId);
TCourse course = courseService.getById(courseOrder.getCourseId());
+ LocalDate endTime = course.getEndTime();
+
+ long count1 = insuranceOrderService.count(new LambdaQueryWrapper<TInsuranceOrder>().eq(TInsuranceOrder::getAppUserId, userId).eq(TInsuranceOrder::getStatus, 2));
+ if(count1<=0){
+ return R.fail("请先缴纳保险费");
+ }
+
+ if(endTime.isBefore(LocalDate.now())){
+ return R.fail("课程已截至报名");
+ }
long count = courseOrderService.count(Wrappers.lambdaQuery(TCourseOrder.class).eq(TCourseOrder::getCourseId, course.getId()).in(TCourseOrder::getPayStatus, Arrays.asList(1, 2, 5)));
if(count>=course.getPeopleLimit()){
return R.fail("报名人数已满");
@@ -155,7 +165,11 @@
@PostMapping("/payOrder")
@ApiOperation(value = "课程模块--支付订单")
public R<Map<String, Object>> payOrder(@RequestBody TCourseOrder courseOrder) {
-// String userId = tokenService.getLoginUserApplet().getUserId();
+ String userId = tokenService.getLoginUserApplet().getUserId();
+ long count1 = insuranceOrderService.count(new LambdaQueryWrapper<TInsuranceOrder>().eq(TInsuranceOrder::getAppUserId, userId).eq(TInsuranceOrder::getStatus, 2));
+ if(count1<=0){
+ return R.fail("请先缴纳保险费");
+ }
// TAppUser appUser = appUserService.getById(userId);
TCourseOrder courseOrder1 = courseOrderService.getById(courseOrder.getId());
// if(!userId.equals(courseOrder1.getAppUserId())){
--
Gitblit v1.7.1