From df30c88c2c76da0cb607bcf129446f43c9a521da Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 09 Oct 2025 02:51:02 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/MedicalInsuranceAccountServiceImpl.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/MedicalInsuranceAccountServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/MedicalInsuranceAccountServiceImpl.java
index 4f78d4c..1fbb716 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/MedicalInsuranceAccountServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/MedicalInsuranceAccountServiceImpl.java
@@ -82,25 +82,25 @@
return Result.error("你的保险额度已领取完！");
}
- // 计算剩余天数
- long remainingDays = ChronoUnit.DAYS.between(now, medicalInsuranceAccount.getExpiryDate()) + 1;
-
- // 计算每日金额
- BigDecimal dailyAmount = calculateDailyAmount(
- medicalInsuranceAccount.getTotalQuota(), (int) remainingDays);
-
- // 如果账户余额不足，则领取剩余全部金额
- if (medicalInsuranceAccount.getAmountClaimed().compareTo(dailyAmount) < 0) {
- dailyAmount = medicalInsuranceAccount.getAmountClaimed();
- }
-
- // 更新待领金额
- medicalInsuranceAccount.setAmountClaimed(medicalInsuranceAccount.getAmountClaimed().subtract(dailyAmount));
+// // 计算剩余天数
+// long remainingDays = ChronoUnit.DAYS.between(now, medicalInsuranceAccount.getExpiryDate()) + 1;
+//
+// // 计算每日金额
+// BigDecimal dailyAmount = calculateDailyAmount(
+// medicalInsuranceAccount.getTotalQuota(), (int) remainingDays);
+//
+// // 如果账户余额不足，则领取剩余全部金额
+// if (medicalInsuranceAccount.getAmountClaimed().compareTo(dailyAmount) < 0) {
+// dailyAmount = medicalInsuranceAccount.getAmountClaimed();
+// }
+//
+// // 更新待领金额
+// medicalInsuranceAccount.setAmountClaimed(medicalInsuranceAccount.getAmountClaimed().subtract(dailyAmount));
// 更新已领取金额
BigDecimal currentAmountReceived = medicalInsuranceAccount.getAlreadyReceived() != null ?
medicalInsuranceAccount.getAlreadyReceived(): BigDecimal.ZERO;
- medicalInsuranceAccount.setAlreadyReceived(currentAmountReceived.add(dailyAmount));
+ medicalInsuranceAccount.setAlreadyReceived(currentAmountReceived.add(medicalInsuranceAccount.getAmountClaimed()));
medicalInsuranceAccountMapper.updateById(medicalInsuranceAccount);
@@ -109,7 +109,7 @@
claim.setAccountId(medicalInsuranceAccount.getId());
claim.setUserId(userAccount.getId());
claim.setClaimDate(today);
- claim.setClaimAmount(dailyAmount);
+ claim.setClaimAmount(medicalInsuranceAccount.getAmountClaimed());
claim.setCreatedAt(new Date());
medicalInsuranceDailyClaimMapper.insert(claim);
return Result.success("领取成功");
--
Gitblit v1.9.3