From 48bce6b7f674cc1e4f6bd044aef049e02d29b4ee Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 11 八月 2023 19:42:22 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
index e12aa54..7ce7a15 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -699,6 +699,13 @@
} else {
serviceFunddetailService.updateById(serviceFunddetail);
}
+ //璁＄畻绋庨噾
+ if (serviceFunddetail.getAmount() != null) {
+ taxBefore = taxBefore + serviceFunddetail.getAmount();
+ }
+ if (serviceFunddetail.getTaxedamount() != null) {
+ taxAfter = taxAfter + serviceFunddetail.getTaxedamount();
+ }
continue;
} else if (serviceFunddetailVO.getTaxedamount() != null && serviceFunddetailVO.getTaxedamount() != 0.0) {
// 绋庡悗姹傜◣鍓�,濡傛灉鏄笓瀹惰垂鐢宠 鎴� 浼︾悊涓撳璐圭敵璇� 鎵嶄細璁＄畻绋庡墠绋庡悗
@@ -726,9 +733,12 @@
} else {
serviceFunddetailService.updateById(serviceFunddetail);
}
- if (serviceFundVO.getApplytype().equals("1") || serviceFundVO.getApplytype().equals("2")) {
- //濡傛灉鏄笓瀹惰垂鐢宠 鎴� 浼︾悊涓撳璐圭敵璇� 鎵嶄細璁＄畻绋庡墠绋庡悗
+// if (serviceFundVO.getApplytype().equals("1") || serviceFundVO.getApplytype().equals("2")) {
+ //濡傛灉鏄笓瀹惰垂鐢宠 鎴� 浼︾悊涓撳璐圭敵璇� 鎵嶄細璁＄畻绋庡墠绋庡悗
+ if (serviceFunddetail.getAmount() != null) {
taxBefore = taxBefore + serviceFunddetail.getAmount();
+ }
+ if (serviceFunddetail.getTaxedamount() != null) {
taxAfter = taxAfter + serviceFunddetail.getTaxedamount();
}
}
--
Gitblit v1.9.3