代码提交

liusheng

2023-11-10 6f344e6360751574f7e03b21c00cfa3f4b2bc099

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java

@@ -15,7 +15,10 @@
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.*;
import com.ruoyi.project.mapper.ServiceFundMapper;
import lombok.extern.flogger.Flogger;
import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -34,7 +37,7 @@
 */
@Service
public class ServiceFunddetailServiceImpl extends ServiceImpl<ServiceFunddetailMapper, ServiceFunddetail> implements IServiceFunddetailService {

    protected final Logger logger = LoggerFactory.getLogger(this.getClass());
    @Autowired
    ServiceFunddetailMapper serviceFunddetailMapper;

@@ -263,6 +266,21 @@
        //保存总税前金额（用于更新fund表里的）
        BigDecimal pretaxcost = BigDecimal.valueOf(0.00);
        for (ServiceFunddetail serviceFunddetail : serviceFunddetails) {
            if (StringUtils.isEmpty(serviceFunddetail.getIdcardno())) {
                logger.info("serviceFunddetail数据入参 ： {}", serviceFunddetail);
                //如果身份证号为空，就不用查了，可能是医院的记录
                if (StringUtils.isEmpty(serviceFunddetail.getServicesscopename()) || !serviceFunddetail.getServicesscopename().contains("税后")) {
                    serviceFunddetail.setTaxedamount(serviceFunddetail.getAmount());
                } else {
                    serviceFunddetail.setAmount(serviceFunddetail.getTaxedamount());
                }
                serviceFunddetail.setTaxamount(0.0);
                logger.info("serviceFunddetail更新后的数据 ： {}", serviceFunddetail);
                boolean b = this.updateById(serviceFunddetail);
                logger.info("serviceFunddetail修改结果 ： {}", b);
                continue;
            }

            //获取当月的第一天
            Date firstDay = Date.from(LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()).atStartOfDay(ZoneId.systemDefault()).toInstant());
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -277,6 +295,7 @@
            taxMoneyVO.setIDCard(serviceFunddetail.getIdcardno());
            //查出税前、税、税后的总额（不包含本次）
            TaxMoneySumEO taxSum = serviceFunddetailMapper.getTaxSum(taxMoneyVO);
            logger.info("查询的taxSum的值 ： {}", taxSum);
            if (ObjectUtils.isEmpty(taxSum)) {
                taxSum = new TaxMoneySumEO();
            }
@@ -286,7 +305,7 @@
                for (ServiceFunddetail serviceFunddetail1 : temporarySave) {
                    //如果本次的”人员类型“、”身份证号“在临时集合中存在，则将集合数据中的该受益人的，税前、税金、税后，和总的相加，并将老的覆盖
                    // if (serviceFunddetail1.getApplytype().equals(serviceFunddetail.getApplytype()) && serviceFunddetail1.getBeneficiaryno().equals(serviceFunddetail.getBeneficiaryno())) {
                    if (serviceFunddetail1.getIdcardno().equals(serviceFunddetail.getIdcardno())) {
                    if (serviceFunddetail1.getIdcardno().trim().equals(serviceFunddetail.getIdcardno().trim())) {
                        //将集合数据中的该受益人的，税前、税金、税后，和总的相加
                        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())));
@@ -300,7 +319,9 @@
                }
            }

            if (!serviceFunddetail.getServicesscopename().contains("税后")) {
            if (StringUtils.isEmpty(serviceFunddetail.getServicesscopename()) || !serviceFunddetail.getServicesscopename().contains("税后")) {
                logger.info("计算税前信息开始：{}", serviceFunddetail);
                logger.info("taxSum入参数据：{}", taxSum);
                // 如何税前金额不为空，用之前的”总税前金额“，加上当前”税前金额“
                BigDecimal newAmounts = BigDecimal.valueOf(taxSum.getAmounts()).add(BigDecimal.valueOf(serviceFunddetail.getAmount()));

@@ -311,18 +332,23 @@

                //计算本次的税后金额(本次的税前金额 - 税金)
                BigDecimal texdAfterNow = BigDecimal.valueOf(serviceFunddetail.getAmount()).subtract(taxAmountNow);
                logger.info("打印newAmounts：{},taxation:{},taxAmountNow:{},texdAfterNow:{}", newAmounts, taxation, taxAmountNow, texdAfterNow);

                //将循环的数据重新放到一个新对象中
                ServiceFunddetail serviceFunddetail3 = DtoConversionUtils.sourceToTarget(serviceFunddetail, ServiceFunddetail.class);
                serviceFunddetail3.setTaxamount(taxAmountNow.doubleValue());
                serviceFunddetail3.setTaxedamount(texdAfterNow.doubleValue());
                serviceFunddetail3.setTaxTime(new Date());
                logger.info("打印税前serviceFunddetail3数据 :{}", serviceFunddetail3);

                // 将该条数据更新
                updateById(serviceFunddetail3);
                boolean b = this.updateById(serviceFunddetail3);
                pretaxcost = pretaxcost.add(BigDecimal.valueOf(serviceFunddetail.getAmount()));
                // 把该数据，放到临时的集合中
                temporarySave.add(serviceFunddetail3);
            } else if (serviceFunddetail.getServicesscopename().contains("税后")) {
                logger.info("计算税后信息开始：{}", serviceFunddetail);
                logger.info("taxSum入参数据：{}", taxSum);
                //税后不为空, 用之前的”总税后金额“，加上当前”税后金额“
                BigDecimal newTaxedAmounts = BigDecimal.valueOf(taxSum.getTaxedAmounts()).add(BigDecimal.valueOf(serviceFunddetail.getTaxedamount()));

@@ -333,12 +359,14 @@

                //算出本次税金(本次税前 - 本次税后)
                BigDecimal tax = amountNow.subtract(BigDecimal.valueOf(serviceFunddetail.getTaxedamount()));
                logger.info("打印newTaxedAmounts：{},taxationBefore:{},amountNow:{},tax:{}", newTaxedAmounts, taxationBefore, amountNow, tax);

                //将循环的数据重新放到一个新对象中
                ServiceFunddetail serviceFunddetail3 = DtoConversionUtils.sourceToTarget(serviceFunddetail, ServiceFunddetail.class);
                serviceFunddetail3.setAmount(amountNow.doubleValue());
                serviceFunddetail3.setTaxamount(tax.doubleValue());
                serviceFunddetail3.setTaxTime(new Date());
                logger.info("打印serviceFunddetail3:{}", serviceFunddetail3);
                // 将该条数据更新
                updateById(serviceFunddetail3);
                pretaxcost = pretaxcost.add(BigDecimal.valueOf(serviceFunddetail3.getAmount()));
@@ -349,6 +377,8 @@
        ServiceFund serviceFund = new ServiceFund();
        serviceFund.setPretaxcost(pretaxcost.doubleValue());
        serviceFund.setId(serviceFunddetails.get(0).getFundid());
        // 1 已算税
        serviceFund.setIstax(1);
        serviceFundMapper.updateById(serviceFund);

        return true;