From 1185adbb07bd860e6bc122571bee437dc22b3eb3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 16 十二月 2025 17:26:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 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 594fa68..43cc43e 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
@@ -130,26 +130,26 @@
courseOrder.setAppUserId(userId);
courseOrder.setPayMoney(course.getCourseCost());
- courseOrder.setPayStatus(1);
+ courseOrder.setPayStatus(0);
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.fail("报名失败");
+// 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("/payOrder")
@@ -161,6 +161,9 @@
// if(!userId.equals(courseOrder1.getAppUserId())){
// return R.fail("无权限操作");
// }
+ if(courseOrder1.getPayStatus()!=1){
+ return R.fail("订单目前无法支付");
+ }
courseOrder1.setOrderNumber(OrderNos.getDid());
courseOrder1.setRealName(courseOrder.getRealName());
courseOrder1.setUserPhone(courseOrder.getUserPhone());
--
Gitblit v1.7.1