From 3326b8c5a5b9a2133729e4cce8298cb549995f45 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 18 六月 2025 16:33:10 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
index 15aa554..0f5631a 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.service.impl;
import java.math.BigDecimal;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.ZoneId;
@@ -349,15 +350,19 @@
taxMoneyVO.setTaxTime(new Date());
}
taxMoneyVO.setFirstDay(firstDay);
+ // 鑾峰彇璇ヨ韩浠借瘉鍙峰湪鏈湀鐨勬墍鏈夎褰�
taxMoneyVO.setFundID(serviceFunddetail.getFundid());
taxMoneyVO.setIDCard(serviceFunddetail.getIdcardno());
if (serviceFunddetail.getXh() != null) {
- taxMoneyVO.setXh(serviceFunddetail.getXh());
+ serviceFunddetail.setXh(null);
+ taxMoneyVO.setXh(maxXH);
+ xhMap.put(serviceFunddetail.getIdcardno(), maxXH);
} else {
taxMoneyVO.setXh(maxXH);
xhMap.put(serviceFunddetail.getIdcardno(), maxXH);
}
//鏌ュ嚭绋庡墠銆佺◣銆佺◣鍚庣殑鎬婚锛堜笉鍖呭惈鏈锛�
+ logger.info("taxMoneyVO鍏ュ弬鐨勫�� 锛� {}", taxMoneyVO);
TaxMoneySumEO taxSum = serviceFunddetailMapper.getTaxSum(taxMoneyVO);
logger.info("鏌ヨ鐨則axSum鐨勫�� 锛� {}", taxSum);
if (ObjectUtils.isEmpty(taxSum)) {
@@ -379,9 +384,11 @@
taxSum.setTaxAmounts(taxAmounts.doubleValue());
taxSum.setTaxedAmounts(TaxedAmounts.doubleValue());
}
- continue;
}
}
+ //璁板綍涓�涓嬭繖涓◣鍓嶆�婚
+ serviceFunddetail.setAllAmount(taxSum.getAmounts());
+
if (serviceFunddetail.getXh() == null) {
serviceFunddetail.setXh(maxXH);
}
--
Gitblit v1.9.3