From ffef20d703aaa9b60c9234dd0b42f3d006426dc7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 31 十二月 2025 17:02:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java | 2 +-
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/InsuranceController.java | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
index 04ca721..5d56e06 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
@@ -87,7 +87,7 @@
// 助需
long helpNeedsCount = tHelpNeedsService.count();
Map<String,Long> map = new HashMap<>();
- map.put("appealServicesCount",appealServicesCount);
+ map.put("appealServicesCount",appealServicesCount+photoCount+appealCount+helpNeedsCount);
map.put("warningCount",warningCount);
map.put("photoCount",photoCount);
map.put("appealCount",appealCount);
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 bac84d9..6498b14 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
@@ -142,6 +142,18 @@
Integer type = order1.getType();
+ String insuranceId = order1.getInsuranceId();
+
+ TInsurance insurance = tInsuranceService.getById(insuranceId);
+ if(insurance==null){
+ return R.fail("保险已关闭，无法退款");
+ }
+
+ // 判断是否过期
+ if(order1.getEndTime().before(new Date())){
+ return R.fail("保险已过期，无法退款");
+ }
+
// 判断是否有当前的课程 待支付 和已完成
int count = tCourseOrderService.countOrderNum( userId, type);
if(count>0){
--
Gitblit v1.7.1