From 72189753cd1a791a8d90aad34c5bcc165143bf49 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 28 一月 2026 15:01:21 +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 | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 5 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 d3ab727..7900495 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
@@ -138,6 +138,55 @@
LocalDate endTime = course.getEndTime();
+ 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("报名人数已满");
+ }
+
+ long userCount = courseOrderService.count(Wrappers.lambdaQuery(TCourseOrder.class)
+ .eq(TCourseOrder::getIdCard, courseOrder.getIdCard())
+ .eq(TCourseOrder::getCourseId, course.getId())
+ .in(TCourseOrder::getPayStatus, 1, 2, 5, 6));
+
+ if(userCount>0){
+ return R.fail("该课程已提交相同的报名意向!");
+ }
+
+ courseOrder.setAppUserId(userId);
+ courseOrder.setPayMoney(course.getCourseCost());
+ courseOrder.setPayStatus(1);
+ courseOrder.setOrderNumber(OrderNos.getDid());
+ boolean save = courseOrderService.save(courseOrder);
+// if (save) {
+// 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();
+// }
+ return R.ok();
+ }
+ @PostMapping("/saveOrderAndPay")
+ @ApiOperation(value = "课程模块--报名并支付")
+ public R<Map<String, Object>> saveOrderAndPay(@RequestBody TCourseOrder courseOrder) {
+ String userId = tokenService.getLoginUserApplet().getUserId();
+ TAppUser appUser = appUserService.getById(userId);
+ TCourse course = courseService.getById(courseOrder.getCourseId());
+ LocalDate endTime = course.getEndTime();
+
+ TOtherConfig config = otherConfigService.getById(1);
long count1 = insuranceOrderService.count(new LambdaQueryWrapper<TInsuranceOrder>().eq(TInsuranceOrder::getType,course.getCourseType()).eq(TInsuranceOrder::getAppUserId, userId).eq(TInsuranceOrder::getStatus, 2));
if(count1<=0){
return R.fail("请先缴纳保险费");
@@ -179,14 +228,14 @@
@ApiOperation(value = "课程模块--支付订单")
public R<Map<String, Object>> payOrder(@RequestBody TCourseOrder courseOrder) {
String userId = tokenService.getLoginUserApplet().getUserId();
-
- TCourse course = courseService.getById(courseOrder.getCourseId());
+ TCourseOrder courseOrder1 = courseOrderService.getById(courseOrder.getId());
+ TCourse course = courseService.getById(courseOrder1.getCourseId());
long count1 = insuranceOrderService.count(new LambdaQueryWrapper<TInsuranceOrder>().eq(TInsuranceOrder::getType,course.getCourseType()).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());
+ TAppUser appUser = appUserService.getById(userId);
+
// if(!userId.equals(courseOrder1.getAppUserId())){
// return R.fail("无权限操作");
// }
@@ -199,7 +248,7 @@
courseOrder1.setIdCard(courseOrder.getIdCard());
courseOrderService.updateById(courseOrder1);
- Map<String, Object> result = wxV3Pay.jsApi(courseOrder1.getOrderNumber(), courseOrder1.getPayMoney().multiply(BigDecimal.valueOf(100)).longValue(), "oz71-1_OevadwmESB_IFAW7PucWY","购买课程","");
+ Map<String, Object> result = wxV3Pay.jsApi(courseOrder1.getOrderNumber(), courseOrder1.getPayMoney().multiply(BigDecimal.valueOf(100)).longValue(), appUser.getOpenId(),"购买课程","");
return R.ok(result);
}
--
Gitblit v1.7.1