From 70fab9b9607f18df92fc2c7c0efced0dcd55d5fc Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 02 三月 2026 09:46:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 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 6ff6409..a343407 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
@@ -96,8 +96,8 @@
Page<TCourseOrder> page = new Page<>(query.getPageNum(), query.getPageSize());
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())
+ .ne(TCourseOrder::getPayStatus, 4)
.orderByDesc(TCourseOrder::getCreateTime));
List<TCourseOrder> records = courseOrderPage.getRecords();
if(!records.isEmpty()){
@@ -186,10 +186,17 @@
TCourse course = courseService.getById(courseOrder.getCourseId());
LocalDate endTime = course.getEndTime();
+ TOtherConfig config = otherConfigService.getById(1);
+ if(config.getIsOpenInsurance()==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("请先缴纳保险费");
+ }
- 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("请先缴纳保险费");
+ }
+
+ if(course.getIsOpenCourse()==0){
+ return R.fail("课程未开启缴费");
}
if(endTime.isBefore(LocalDate.now())){
@@ -228,14 +235,19 @@
@ApiOperation(value = "课程模块--支付订单")
public R<Map<String, Object>> payOrder(@RequestBody TCourseOrder courseOrder) {
String userId = tokenService.getLoginUserApplet().getUserId();
+ TCourseOrder courseOrder1 = courseOrderService.getById(courseOrder.getId());
+ TCourse course = courseService.getById(courseOrder1.getCourseId());
- TCourse course = courseService.getById(courseOrder.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("请先缴纳保险费");
+ TOtherConfig config = otherConfigService.getById(1);
+ if(config.getIsOpenInsurance()==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("请先缴纳保险费");
+ }
+
}
TAppUser appUser = appUserService.getById(userId);
- TCourseOrder courseOrder1 = courseOrderService.getById(courseOrder.getId());
+
// if(!userId.equals(courseOrder1.getAppUserId())){
// return R.fail("无权限操作");
// }
@@ -284,6 +296,9 @@
}else {
String outRefundNo = OrderNos.getDid();
courseOrder1.setRefundNumber(outRefundNo);
+ courseOrder1.setBankCardNumber(courseOrder.getBankCardNumber());
+ courseOrder1.setCardholderName(courseOrder.getCardholderName());
+ courseOrder1.setBankName(courseOrder.getBankName());
courseOrderService.updateById(courseOrder1);
// WxPaymentRefundModel refundModel = new WxPaymentRefundModel();
//// refundModel.setSub_mchid(weixinPayProperties.getMchId());
--
Gitblit v1.7.1