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/ServiceFunddetailServiceImpl.java | 101 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 99 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 698d830..aae29db 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,8 +1,11 @@ package com.ruoyi.project.service.impl; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.time.LocalDate; +import java.time.ZoneId; import java.time.temporal.TemporalAdjusters; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -11,8 +14,7 @@ import com.ruoyi.common.tax.TaxtUtils; import com.ruoyi.common.utils.bean.DtoConversionUtils; import com.ruoyi.project.domain.*; -import com.ruoyi.project.domain.vo.TaxMoneyVO; -import com.ruoyi.project.domain.vo.TaxedMoneyVO; +import com.ruoyi.project.domain.vo.*; import com.ruoyi.project.mapper.ServiceFundMapper; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -23,6 +25,7 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.project.mapper.ServiceFunddetailMapper; import com.ruoyi.project.service.IServiceFunddetailService; +import org.springframework.transaction.annotation.Transactional; /** * 璐圭敤鐢宠鏄庣粏Service涓氬姟灞傚鐞� @@ -231,4 +234,98 @@ return serviceFunddetailVOS; } + /** + * 鏍规嵁鏉′欢绠楃◣ + * + * @param serviceFunddetails + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean calculateTax(List<ServiceFunddetail> serviceFunddetails) { + //鐢ㄤ簬涓存椂淇濆瓨宸茬粡绠楀ソ鐨�"璐圭敤璇︽儏鏁版嵁" + List<ServiceFunddetail> temporarySave = new ArrayList<>(); + + for (ServiceFunddetail serviceFunddetail : serviceFunddetails) { + //鑾峰彇褰撴湀鐨勭涓�澶� + Date firstDay = Date.from(LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()).atStartOfDay(ZoneId.systemDefault()).toInstant()); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String firstDatStr = dateFormat.format(firstDay); + TaxMoneyByItemEO taxMoneyVO = new TaxMoneyByItemEO(); + + taxMoneyVO.setTaxTime(new Date()); + taxMoneyVO.setFirstDay(firstDay); + taxMoneyVO.setApplyType(Long.valueOf(serviceFunddetail.getApplytype())); + taxMoneyVO.setFundID(serviceFunddetail.getFundid()); + taxMoneyVO.setBeneficiaryNo(serviceFunddetail.getBeneficiaryno()); + //鏌ュ嚭绋庡墠銆佺◣銆佺◣鍚庣殑鎬婚锛堜笉鍖呭惈鏈锛� + TaxMoneySumEO taxSum = serviceFunddetailMapper.getTaxSum(taxMoneyVO); + if (ObjectUtils.isEmpty(taxSum)) { + taxSum = new TaxMoneySumEO(); + } + + //鍒ゆ柇涓存椂闆嗗悎temporarySave涓紝鏈夋病鏈夊凡缁忕畻杩囩殑鏁版嵁 + if (CollectionUtils.isNotEmpty(temporarySave)) { + for (ServiceFunddetail serviceFunddetail1 : temporarySave) { + //濡傛灉鏈鐨勨�濅汉鍛樼被鍨嬧�溿�佲�濆彈鐩婁汉缂栧彿鈥滃湪涓存椂闆嗗悎涓瓨鍦紝鍒欏皢闆嗗悎鏁版嵁涓殑璇ュ彈鐩婁汉鐨勶紝绋庡墠銆佺◣閲戙�佺◣鍚庯紝鍜屾�荤殑鐩稿姞锛屽苟灏嗚�佺殑瑕嗙洊 + if (serviceFunddetail1.getApplytype().equals(serviceFunddetail.getApplytype()) && serviceFunddetail1.getBeneficiaryno().equals(serviceFunddetail.getBeneficiaryno())) { + //灏嗛泦鍚堟暟鎹腑鐨勮鍙楃泭浜虹殑锛岀◣鍓嶃�佺◣閲戙�佺◣鍚庯紝鍜屾�荤殑鐩稿姞 + BigDecimal amounts = BigDecimal.valueOf(taxSum.getAmounts()).add(new BigDecimal(String.valueOf(serviceFunddetail1.getAmount()))); + BigDecimal taxAmounts = BigDecimal.valueOf(taxSum.getTaxAmounts()).add(new BigDecimal(String.valueOf(serviceFunddetail1.getTaxamount()))); + BigDecimal TaxedAmounts = BigDecimal.valueOf(taxSum.getTaxedAmounts()).add(new BigDecimal(String.valueOf(serviceFunddetail1.getTaxedamount()))); + //灏嗚�佺殑瑕嗙洊 + taxSum.setAmounts(amounts.doubleValue()); + taxSum.setTaxAmounts(taxAmounts.doubleValue()); + taxSum.setTaxedAmounts(TaxedAmounts.doubleValue()); + } + continue; + } + } + + if (!serviceFunddetail.getServicesscopename().contains("绋庡悗")) { + // 濡備綍绋庡墠閲戦涓嶄负绌猴紝鐢ㄤ箣鍓嶇殑鈥濇�荤◣鍓嶉噾棰濃�滐紝鍔犱笂褰撳墠鈥濈◣鍓嶉噾棰濃�� + BigDecimal newAmounts = BigDecimal.valueOf(taxSum.getAmounts()).add(BigDecimal.valueOf(serviceFunddetail.getAmount())); + + // 璁$畻鎬荤◣閲戯紙鍖呭惈鏈锛� + String taxation = TaxtUtils.getTaxation(newAmounts); + //璁$畻鏈绋庨噾锛堟�荤◣閲戯紙鍖呭惈鏈锛� - 鎬荤◣閲戯紙涓嶅寘鍚湰娆★級锛� + BigDecimal taxAmountNow = new BigDecimal(taxation).subtract(new BigDecimal(String.valueOf(taxSum.getTaxAmounts()))); + + //璁$畻鏈鐨勭◣鍚庨噾棰�(鏈鐨勭◣鍓嶉噾棰� - 绋庨噾) + BigDecimal texdAfterNow = BigDecimal.valueOf(serviceFunddetail.getAmount()).subtract(taxAmountNow); + + //灏嗗惊鐜殑鏁版嵁閲嶆柊鏀惧埌涓�涓柊瀵硅薄涓� + ServiceFunddetail serviceFunddetail3 = DtoConversionUtils.sourceToTarget(serviceFunddetail, ServiceFunddetail.class); + serviceFunddetail3.setTaxamount(taxAmountNow.doubleValue()); + serviceFunddetail3.setTaxedamount(texdAfterNow.doubleValue()); + serviceFunddetail3.setTaxTime(new Date()); + // 灏嗚鏉℃暟鎹洿鏂� + updateById(serviceFunddetail3); + // 鎶婅鏁版嵁锛屾斁鍒颁复鏃剁殑闆嗗悎涓� + temporarySave.add(serviceFunddetail3); + } else if (serviceFunddetail.getServicesscopename().contains("绋庡悗")) { + //绋庡悗涓嶄负绌�, 鐢ㄤ箣鍓嶇殑鈥濇�荤◣鍚庨噾棰濃�滐紝鍔犱笂褰撳墠鈥濈◣鍚庨噾棰濃�� + BigDecimal newTaxedAmounts = BigDecimal.valueOf(taxSum.getTaxedAmounts()).add(BigDecimal.valueOf(serviceFunddetail.getTaxedamount())); + + //閫氳繃鎬荤◣鍚庯紙鍖呭惈鏈锛夌畻鍑烘�荤◣鍓� + String taxationBefore = TaxtUtils.getTaxationBefore(newTaxedAmounts); + //绠楀嚭鏈绋庡墠锛堟�荤◣鍓嶏紙鍖呭惈鏈锛� - 鎬荤◣鍓嶏紙涓嶅寘鍚湰娆★級锛� + BigDecimal amountNow = new BigDecimal(taxationBefore).subtract(BigDecimal.valueOf(taxSum.getAmounts())); + + //绠楀嚭鏈绋庨噾(鏈绋庡墠 - 鏈绋庡悗) + BigDecimal tax = amountNow.subtract(BigDecimal.valueOf(serviceFunddetail.getTaxedamount())); + + //灏嗗惊鐜殑鏁版嵁閲嶆柊鏀惧埌涓�涓柊瀵硅薄涓� + ServiceFunddetail serviceFunddetail3 = DtoConversionUtils.sourceToTarget(serviceFunddetail, ServiceFunddetail.class); + serviceFunddetail3.setAmount(amountNow.doubleValue()); + serviceFunddetail3.setTaxamount(tax.doubleValue()); + serviceFunddetail3.setTaxTime(new Date()); + // 灏嗚鏉℃暟鎹洿鏂� + updateById(serviceFunddetail3); + // 鎶婅鏁版嵁锛屾斁鍒颁复鏃剁殑闆嗗悎涓� + temporarySave.add(serviceFunddetail3); + } + } + return true; + } + } -- Gitblit v1.9.3