From b47cd768140f8938775e449e7be631b880f93340 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 10 Oct 2025 18:38:27 +0800
Subject: [PATCH] 1
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/UserPolicy.java | 3 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserPolicyController.java | 6 +++---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/InsuranceProductController.java | 3 ++-
ruoyi-system/src/main/java/com/ruoyi/system/domain/MedicalInsuranceAccount.java | 4 ++++
ruoyi-system/src/main/java/com/ruoyi/system/domain/InsuranceProduct.java | 3 +++
ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/InsuranceProductUpdateDTO.java | 3 +++
6 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/InsuranceProductController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/InsuranceProductController.java
index 1f838bf..08bc094 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/InsuranceProductController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/InsuranceProductController.java
@@ -56,7 +56,7 @@
insuranceProduct.setCoverageAmount(dto.getCoverageAmount());
insuranceProduct.setPremium(dto.getPremium());
insuranceProduct.setTerm(dto.getTerm());
-
+ insuranceProduct.setNumberDays(dto.getNumberDays());
// 处理枚举状态
if (dto.getStatus() != null) {
try {
@@ -196,6 +196,7 @@
product.setCoverageAmount(dto.getCoverageAmount());
product.setPremium(dto.getPremium());
product.setTerm(dto.getTerm());
+ product.setNumberDays(dto.getNumberDays());
// 处理状态
if (dto.getStatus() != null) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserPolicyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserPolicyController.java
index 09d15b3..4b1485e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserPolicyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserPolicyController.java
@@ -192,7 +192,7 @@
}
//计算到期时间
- LocalDate expirationTime = calculateInsuranceEndDateToDay(LocalDate.now(), userPolicy.getTerm());
+ LocalDate expirationTime = calculateInsuranceEndDate(LocalDate.now(), userPolicy.getNumberDays());
userPolicy.setApprovalStatus(approvalStatus);
userPolicy.setMessage(message);
@@ -205,7 +205,7 @@
//每天可领
BigDecimal amountClaimed = userPolicy.getCoverageAmount()
- .divide(new BigDecimal(userPolicy.getTerm()), 4, RoundingMode.HALF_UP);
+ .divide(new BigDecimal(userPolicy.getNumberDays()), 4, RoundingMode.HALF_UP);
MedicalInsuranceAccount medicalInsuranceAccount = new MedicalInsuranceAccount();
medicalInsuranceAccount.setUserId(userPolicy.getUserId());
@@ -273,7 +273,7 @@
}
/**
- * 计算保险到期日
+ * 计算保险到期日按天
* @param startDate 保险开始日期
* @param termDays 保险天数
* @return 保险到期日期
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/InsuranceProduct.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/InsuranceProduct.java
index cda23d0..1279e7d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/InsuranceProduct.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/InsuranceProduct.java
@@ -39,6 +39,9 @@
// 保险期限（如：1年/终身）
private Integer term;
+ //可领取天数
+ private Integer numberDays;
+
// 产品状态
private ProductStatus status;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/MedicalInsuranceAccount.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/MedicalInsuranceAccount.java
index a79b99d..dc9393a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/MedicalInsuranceAccount.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/MedicalInsuranceAccount.java
@@ -49,6 +49,10 @@
// 账户失效日期
private LocalDate expiryDate;
+ // 领取失效日期
+ private LocalDate insuranceBenefitExpiryDate;
+
+
// 账户状态
private AccountStatus accountStatus;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserPolicy.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserPolicy.java
index f46a16c..91d6675 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserPolicy.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserPolicy.java
@@ -41,6 +41,9 @@
// 保险期限（如：1天/终身）
private Integer term;
+ //可领取天数
+ private Integer numberDays;
+
// 姓名
private String name;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/InsuranceProductUpdateDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/InsuranceProductUpdateDTO.java
index 155e6c7..ff45243 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/InsuranceProductUpdateDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/InsuranceProductUpdateDTO.java
@@ -31,6 +31,9 @@
// 保险期限
private Integer term;
+ //可领取天数
+ private Integer numberDays;
+
// 产品状态产品状态（ACTIVE 上架，INACTIVE 下架）
private String status;
--
Gitblit v1.9.3