From fa8521a23af37854e7a23d35467147bd00e008b2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 14 九月 2023 18:57:31 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 66 +-------------------------------
1 files changed, 3 insertions(+), 63 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 db211f1..1cb4537 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
@@ -670,6 +670,7 @@
@Transactional
public Long addOrUpdateNew(ServiceFundVO serviceFundVO) {
Long id = null;
+ //灏嗘暟鎹繚瀛樺埌fund琛�
if (serviceFundVO.getId() == null) {
save(serviceFundVO);
id = serviceFundVO.getId();
@@ -682,82 +683,21 @@
System.out.println("serviceFunddetails涓虹┖鍠�");
return null;
}
- // 鐢ㄤ簬璁板綍绋庡墠銆佺◣鍚庣殑鎬诲拰
- double taxBefore = 0.0;
- double taxAfter = 0.0;
-
+ // 淇濆瓨璇︽儏鏁版嵁
for (ServiceFunddetailVO serviceFunddetailVO : serviceFunddetails) {
serviceFunddetailVO.setFundid(id);
//灏囬檮浠惰浆鎴恓son
if (!CollectionUtils.isEmpty(serviceFunddetailVO.getAnnexfilesList())) {
serviceFunddetailVO.setAnnexfiles(JSON.toJSONString(serviceFunddetailVO.getAnnexfilesList()));
}
- if (serviceFunddetailVO.getTaxedamount() != null && serviceFunddetailVO.getAmount() != null && serviceFunddetailVO.getTaxedamount() != 0.0 && serviceFunddetailVO.getAmount() != 0.0) {
- // 绋庡墠绋庡悗閮戒笉涓虹┖
- ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class);
-
-
- if (serviceFunddetailVO.getId() == null) {
- serviceFunddetailService.save(serviceFunddetail);
- } 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) {
- // 绋庡悗姹傜◣鍓�,濡傛灉鏄笓瀹惰垂鐢宠 鎴� 浼︾悊涓撳璐圭敵璇� 鎵嶄細璁＄畻绋庡墠绋庡悗
- if (StringUtils.isNotEmpty(serviceFundVO.getApplytype()) && serviceFundVO.getApplytype().equals("1") || serviceFundVO.getApplytype().equals("2")) {
- Double taxationBefore = Double.valueOf(TaxtUtils.getTaxationBefore(BigDecimal.valueOf(serviceFunddetailVO.getTaxedamount())));
- // 绋庨噾
- String taxation = TaxtUtils.getTaxation(BigDecimal.valueOf(taxationBefore));
- serviceFunddetailVO.setAmount(Double.valueOf(taxationBefore));
- serviceFunddetailVO.setTaxamount(Double.parseDouble(taxation));
- }
- } else if (serviceFunddetailVO.getAmount() != null && serviceFunddetailVO.getAmount() != 0.0) {
- // 绋庡墠姹傜◣鍚�,濡傛灉鏄笓瀹惰垂鐢宠 鎴� 浼︾悊涓撳璐圭敵璇� 鎵嶄細璁＄畻绋庡墠绋庡悗
- if (StringUtils.isNotEmpty(serviceFundVO.getApplytype()) && serviceFundVO.getApplytype().equals("1") || serviceFundVO.getApplytype().equals("2")) {
- double tax = Double.parseDouble(TaxtUtils.getTaxation(BigDecimal.valueOf(serviceFunddetailVO.getAmount())));
- BigDecimal taxAfterMoney = BigDecimal.valueOf(serviceFunddetailVO.getAmount()).subtract(BigDecimal.valueOf(tax));
- serviceFunddetailVO.setTaxamount(tax);
- serviceFunddetailVO.setTaxedamount(taxAfterMoney.doubleValue());
- }
- }
-
- //鏍规嵁id鍒ゆ柇鏄柊澧炶繕鏄慨鏀�
ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class);
+
if (serviceFunddetailVO.getId() == null) {
serviceFunddetailService.save(serviceFunddetail);
} else {
serviceFunddetailService.updateById(serviceFunddetail);
}
-// 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();
- }
}
- //灏嗙◣鍓嶃�佺◣鍚庨噾棰濇洿鏂板埌fund琛ㄤ腑
- serviceFundVO.setPretaxcost(taxBefore);
- serviceFundVO.setTaxedcost(taxAfter);
- //鐢宠閲戦涓哄惈绋庨噾棰�
- if (serviceFundVO.getApplytype().equals("1") || serviceFundVO.getApplytype().equals("2")) {
- //涓◣ 绋庡墠锛堟湁绋庯級 - 绋� = 绋庡悗
- serviceFundVO.setAmountrequested(taxBefore);
- } else {
- //閲囪喘 绋庡墠锛堟棤绋庯級 + 绋� = 绋庡悗锛堝惈绋庨噾棰濓級
- serviceFundVO.setAmountrequested(taxAfter);
- }
-
- updateById(serviceFundVO);
return id;
}
--
Gitblit v1.9.3