代码提交

liusheng

12 小时以前 3326b8c5a5b9a2133729e4cce8298cb549995f45

 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,11 +350,10 @@
                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);
@@ -362,6 +362,7 @@
                xhMap.put(serviceFunddetail.getIdcardno(), maxXH);
            }
            //查出税前、税、税后的总额（不包含本次）
            logger.info("taxMoneyVO入参的值 ： {}", taxMoneyVO);
            TaxMoneySumEO taxSum = serviceFunddetailMapper.getTaxSum(taxMoneyVO);
            logger.info("查询的taxSum的值 ： {}", taxSum);
            if (ObjectUtils.isEmpty(taxSum)) {
@@ -383,9 +384,11 @@
                        taxSum.setTaxAmounts(taxAmounts.doubleValue());
                        taxSum.setTaxedAmounts(TaxedAmounts.doubleValue());
                    }
                    continue;
                }
            }
            //记录一下这个税前总额
            serviceFunddetail.setAllAmount(taxSum.getAmounts());

            if (serviceFunddetail.getXh() == null) {
                serviceFunddetail.setXh(maxXH);
            }