From d3c5c55e414cc06f62371d41f97b57f40fe7d083 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 30 十二月 2025 09:34:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java | 20 +++++++++++++++-----
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/InsuranceController.java | 2 +-
2 files changed, 16 insertions(+), 6 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 5e71224..f6dd62d 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
@@ -9,12 +9,10 @@
import com.ruoyi.system.model.TCourse;
import com.ruoyi.system.model.TCourseOrder;
import com.ruoyi.system.model.TInsuranceOrder;
+import com.ruoyi.system.model.TOtherConfig;
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.service.TInsuranceOrderService;
+import com.ruoyi.system.service.*;
import com.ruoyi.system.wxPay.model.WeixinPayProperties;
import com.ruoyi.system.wxPay.utils.WxRefundUtil;
import com.ruoyi.system.wxPay.utils.WxV3Pay;
@@ -46,8 +44,9 @@
private final WeixinPayProperties weixinPayProperties;
private final TAppUserService appUserService;
private final TInsuranceOrderService insuranceOrderService;
+ private final TOtherConfigService otherConfigService;
- public CourseController(TCourseService courseService, TCourseOrderService courseOrderService, TokenService tokenService, WxV3Pay wxV3Pay, WeixinPayProperties weixinPayProperties, TAppUserService appUserService, TInsuranceOrderService insuranceOrderService) {
+ public CourseController(TCourseService courseService, TCourseOrderService courseOrderService, TokenService tokenService, WxV3Pay wxV3Pay, WeixinPayProperties weixinPayProperties, TAppUserService appUserService, TInsuranceOrderService insuranceOrderService, TOtherConfigService otherConfigService) {
this.courseService = courseService;
this.courseOrderService = courseOrderService;
this.tokenService = tokenService;
@@ -55,8 +54,19 @@
this.weixinPayProperties = weixinPayProperties;
this.appUserService = appUserService;
this.insuranceOrderService = insuranceOrderService;
+ this.otherConfigService = otherConfigService;
+
}
+
+ @GetMapping("/getOtherConfig")
+ @ApiOperation(value = "课程模块--是否开启课程缴费 1=是 0=否",response = TOtherConfig.class)
+ public R<TOtherConfig> getOtherConfig() {
+ TOtherConfig tOtherConfig = otherConfigService.getById(1);
+ return R.ok(tOtherConfig);
+ }
+
+
@PostMapping("/getCourseList")
@ApiOperation(value = "课程模块--列表",response = TCourse.class)
public R<Page<TCourse>> getCourseList(@RequestBody GetCourseListQuery query) {
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/InsuranceController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/InsuranceController.java
index 59533b4..436e181 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/InsuranceController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/InsuranceController.java
@@ -145,7 +145,7 @@
if(payTime==null){
return R.fail("状态不允许退款");
}
- if(payTime.plusDays(2).isBefore(LocalDateTime.now())){
+ if(payTime.plusDays(2).isBefore(LocalDateTime.now()) || order.getPayType()==2){
order1.setBankCardNumber(order.getBankCardNumber());
order1.setCardholderName(order.getCardholderName());
order1.setRefundStatus(1);
--
Gitblit v1.7.1