From a2a18245bd730c192218478faf2b04a02aa74e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 11 Apr 2024 10:59:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BC=B4=E6=AC=BE=E5=8F=8D?= =?UTF-8?q?=E9=A6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/TaxDeclareStatusService.java | 6 +++--- .../impl/AbstractTaxPaymentService.java | 4 +--- .../service/impl/SIArchivesServiceImpl.java | 2 -- .../impl/SalaryAcctCalcServiceImpl.java | 1 - .../impl/SalaryArchiveExcelServiceImpl.java | 1 - .../service/impl/SalaryArchiveServiceImpl.java | 1 - .../TaxDeclarationApiFlowWarnServiceImpl.java | 4 +--- .../impl/TaxDeclareRecordServiceImpl.java | 18 ++++++++++++------ .../impl/TaxDeclareStatusServiceImpl.java | 8 +++++--- .../TaxPaymentWithheldVoucherServiceImpl.java | 2 -- .../impl/TaxPaymentWithholdingServiceImpl.java | 9 ++++----- ...axPaymentWithholdingVoucherServiceImpl.java | 4 ---- .../wrapper/TaxDeclareRecordWrapper.java | 2 +- 13 files changed, 27 insertions(+), 35 deletions(-) diff --git a/src/com/engine/salary/service/TaxDeclareStatusService.java b/src/com/engine/salary/service/TaxDeclareStatusService.java index b2c970ef9..b40b2c738 100644 --- a/src/com/engine/salary/service/TaxDeclareStatusService.java +++ b/src/com/engine/salary/service/TaxDeclareStatusService.java @@ -23,15 +23,15 @@ public interface TaxDeclareStatusService { TaxDeclareStatusPO getTaxDeclareStatus(Long taxDeclareRecordId, Integer reportType); /** - * 获取申报记录状态列表 + * 更新主记录，返回申报记录状态列表 * @param id * @return */ - List getOrInitTaxReports(Long id); + List updateRecord(Long id); /** * 更新申报状态，同时更新主记录 * @param declareStatus */ - void updateTaxDeclareStatus(TaxDeclareStatusPO declareStatus); + void updateTaxDeclareStatus(TaxDeclareStatusPO declareStatus,boolean updateRecord); } diff --git a/src/com/engine/salary/service/impl/AbstractTaxPaymentService.java b/src/com/engine/salary/service/impl/AbstractTaxPaymentService.java index a0b762c91..25078bcf0 100644 --- a/src/com/engine/salary/service/impl/AbstractTaxPaymentService.java +++ b/src/com/engine/salary/service/impl/AbstractTaxPaymentService.java @@ -26,13 +26,12 @@ import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.taxpayment.TaxPaymentRequestMapper; import com.engine.salary.service.*; import com.engine.salary.util.*; -import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.db.IdGenerator; +import com.engine.salary.util.db.MapperProxyFactory; import lombok.AllArgsConstructor; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.transaction.annotation.Transactional; import weaver.hrm.User; import java.math.BigDecimal; @@ -145,7 +144,6 @@ public abstract class AbstractTaxPaymentService extends Service implements TaxPa return new TempWrapper(apiConfigPO, taxReturnPO, taxAgentPO, taxDeclareRecord); } - @Transactional(rollbackFor = Exception.class) public String getRequestId(TaxPaymentQueryParam param) { TempWrapper tempWrapper = checkBeforeGetRequestIdResponse(param); QuerySpecialAmountResponse queryResponse = getRequestIdResponse(tempWrapper.taxReturnPO, tempWrapper.taxAgentPO.getName(), diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index 811127514..fbdf3f0b6 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -314,7 +314,6 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService * @param currentEmployeeId */ @Override - @Transactional(rollbackFor = Exception.class) public void handleStayDelData(long currentEmployeeId) { log.info("福利档案中待减员数据自动处理逻辑开始："); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM"); @@ -351,7 +350,6 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService * 福利档案中增量数据处理 * @param currentEmployeeId */ - @Transactional(rollbackFor = Exception.class) @Override public void handleChangeData(long currentEmployeeId) { try { diff --git a/src/com/engine/salary/service/impl/SalaryAcctCalcServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctCalcServiceImpl.java index c48450772..1df986fef 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctCalcServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctCalcServiceImpl.java @@ -135,7 +135,6 @@ // } // // @Override -// @Transactional(rollbackFor = Exception.class) // public void calcByEmployeeIds(Long salaryAcctRecordId, Collection salaryAcctEmployeeIds, DataCollectionEmployee simpleEmployee) throws Exception { // SalaryAcctRateDTO salaryAcctRate = new SalaryAcctRateDTO("" + salaryAcctRecordId); // try { diff --git a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java index 8e0986007..c34c1fcc3 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java @@ -403,7 +403,6 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch // * 导入薪资档案 // */ // @BatchImportHandler("importSalaryArchive") -// @Transactional(rollbackFor = Exception.class) // public void importSalaryArchive() { // BatchDocumentMessage message = BatchImportContext.getBatchDocumentMessage(); // log.info("【薪资档案】接收到上传的数据：{}", String.format("batchTaskId=%s, fileName=%s", message.getBatchTaskId(), message.getBatchFile().getName())); diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index c6b3032c6..22b6eb738 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -253,7 +253,6 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe * * @param currentEmployeeId */ - @Transactional(rollbackFor = Exception.class) public void handleSuspendData(Long currentEmployeeId) { List personnelStatuss = new ArrayList() {{ add("4"); diff --git a/src/com/engine/salary/service/impl/TaxDeclarationApiFlowWarnServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationApiFlowWarnServiceImpl.java index 97833c197..276f3ab71 100644 --- a/src/com/engine/salary/service/impl/TaxDeclarationApiFlowWarnServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxDeclarationApiFlowWarnServiceImpl.java @@ -28,13 +28,12 @@ import com.engine.salary.service.TaxDeclarationApiFlowWarnService; import com.engine.salary.util.SalaryAssert; import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryI18nUtil; +import com.engine.salary.util.db.IdGenerator; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; -import com.engine.salary.util.db.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.transaction.annotation.Transactional; import weaver.common.MessageUtil; import weaver.email.EmailWorkRunnable; import weaver.general.BaseBean; @@ -103,7 +102,6 @@ public class TaxDeclarationApiFlowWarnServiceImpl extends Service implements Tax } @Override - @Transactional(rollbackFor = Exception.class) public void deleteReceiver(Long id) { TaxDeclarationApiFlowWarnReceiverPO receiverPO = getWarnReceiverPOById(id); SalaryAssert.notNull(receiverPO, "该提醒对象不存在，请刷新页面后重试"); diff --git a/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java index 468e53afa..7ab44eb0c 100644 --- a/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java @@ -724,7 +724,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe declareStatus.setTaxDeclareStatus(TaxDeclareStatusEnum.DECLARING.getValue()); declareStatus.setRequestId(declareTaxResponse.getBody().getRequestId()); declareStatus.setTaxDeclareErrorMsg(""); - getTaxDeclareStatusService(user).updateTaxDeclareStatus(declareStatus); + getTaxDeclareStatusService(user).updateTaxDeclareStatus(declareStatus,true); // 记录日志 TaxAgentPO taxAgent = taxDeclareRequest.getTaxAgent(); @@ -831,7 +831,9 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe declareStatus.setPersonNum(Integer.parseInt(Optional.ofNullable(declareTaxFeedbackResponse.getBody().get("nsrc")).orElse("0").toString())); declareStatus.setDeclareRequestId(declareStatus.getRequestId()); declareStatus.setRequestId(""); + //实缴（不含滞纳金） BigDecimal purePaidAmount = SalaryEntityUtil.empty2Zero(declareStatus.getTaxPurePaidAmount()); + //应缴 BigDecimal payAmount = SalaryEntityUtil.empty2Zero(declareStatus.getTaxPayAmount()); if (TaxDeclareStatusEnum.DECLARE_SUCCESS_PAID.equals(taxDeclareStatusEnum) || TaxDeclareStatusEnum.DECLARE_SUCCESS_NO_PAY.equals(taxDeclareStatusEnum)) { // 如果是已缴纳状态，则更新已缴纳金额，判断是否需要线下退税 @@ -850,7 +852,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe declareStatus.setTaxPayAmount(payAmount.subtract(purePaidAmount).toString()); } //更新申报状态 - getTaxDeclareStatusService(user).updateTaxDeclareStatus(declareStatus); + getTaxDeclareStatusService(user).updateTaxDeclareStatus(declareStatus,true); // 如果申报失败 if (CollectionUtils.isNotEmpty(taxDeclareFails)) { @@ -921,7 +923,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe // 更新个税申报状态 declareStatus.setTaxDeclareStatus(TaxDeclareStatusEnum.DECLARE_CANCELLING.getValue()); declareStatus.setRequestId(declareTaxResponse.getBody().getRequestId()); - getTaxDeclareStatusService(user).updateTaxDeclareStatus(declareStatus); + getTaxDeclareStatusService(user).updateTaxDeclareStatus(declareStatus,true); // 记录日志 TaxAgentPO taxAgent = taxDeclareRequest.getTaxAgent(); @@ -978,7 +980,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe //更新个税申报状态 declareStatus.setTaxDeclareStatus(taxDeclareStatusEnum.getValue()); declareStatus.setRequestId(""); - getTaxDeclareStatusService(user).updateTaxDeclareStatus(declareStatus); + getTaxDeclareStatusService(user).updateTaxDeclareStatus(declareStatus,true); // 记录日志 TaxAgentPO taxAgent = taxDeclareRequest.getTaxAgent(); @@ -1021,7 +1023,11 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe Map>> map = new HashMap<>(); List list = getTaxDeclarationService(user).listByTaxDeclareRecordId(id); - list.stream().map(TaxDeclarationPO::getIncomeCategory).map(IncomeCategoryEnum::parseByValue).forEach(e -> e.parseGetDeclareTaxResultFeedbackResponse(map, declareTaxResultFeedbackResponse)); + list.stream() + .map(TaxDeclarationPO::getIncomeCategory) + .map(IncomeCategoryEnum::parseByValue) + .filter(incomeCategoryEnum -> incomeCategoryEnum.getReportType().getValue().equals(param.getReportType())) + .collect(Collectors.toList()).forEach(e -> e.parseGetDeclareTaxResultFeedbackResponse(map, declareTaxResultFeedbackResponse)); return ExcelUtil.genWorkbookV2(map); } @@ -1065,7 +1071,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe declareStatus.setTaxDeclareType(TaxDeclareTypeEnum.UPDATE_DECLARE.getValue()); declareStatus.setTaxDeclareStatus(NOT_DECLARE.getValue()); declareStatus.setRequestId(""); - getTaxDeclareStatusService(user).updateTaxDeclareStatus(declareStatus); + getTaxDeclareStatusService(user).updateTaxDeclareStatus(declareStatus,true); // 记录日志 TaxAgentPO taxAgent = taxDeclareRequest.getTaxAgent(); diff --git a/src/com/engine/salary/service/impl/TaxDeclareStatusServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclareStatusServiceImpl.java index f5d10ee62..d2db18c73 100644 --- a/src/com/engine/salary/service/impl/TaxDeclareStatusServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxDeclareStatusServiceImpl.java @@ -56,17 +56,19 @@ public class TaxDeclareStatusServiceImpl extends Service implements TaxDeclareSt @Override - public void updateTaxDeclareStatus(TaxDeclareStatusPO declareStatus) { + public void updateTaxDeclareStatus(TaxDeclareStatusPO declareStatus, boolean updateRecord) { //更新申报表状态 getTaxDeclareStatusMapper().updateIgnoreNull(declareStatus); //更新主记录 - getOrInitTaxReports(declareStatus.getTaxDeclareRecordId()); + if (updateRecord) { + updateRecord(declareStatus.getTaxDeclareRecordId()); + } } @Override - public List getOrInitTaxReports(Long id) { + public List updateRecord(Long id) { // 查询个税申报记录 TaxDeclareRecordPO taxDeclareRecord = getTaxDeclareRecordMapper().getById(id); diff --git a/src/com/engine/salary/service/impl/TaxPaymentWithheldVoucherServiceImpl.java b/src/com/engine/salary/service/impl/TaxPaymentWithheldVoucherServiceImpl.java index 22a5c0015..235bdeefd 100644 --- a/src/com/engine/salary/service/impl/TaxPaymentWithheldVoucherServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxPaymentWithheldVoucherServiceImpl.java @@ -17,7 +17,6 @@ import com.engine.salary.util.SalaryDateUtil; import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryI18nUtil; import lombok.extern.slf4j.Slf4j; -import org.springframework.transaction.annotation.Transactional; import java.util.*; @@ -42,7 +41,6 @@ public class TaxPaymentWithheldVoucherServiceImpl extends AbstractTaxPaymentServ return postRequest(apiConfig, url, requestParam, clazz); } - @Transactional(rollbackFor = Exception.class) @Override public TaxWithheldVoucherResultDTO getWithheldVoucher(TaxPaymentQueryParam param) { TempWrapper tempWrapper = checkBeforeGetRequestIdResponse(param); diff --git a/src/com/engine/salary/service/impl/TaxPaymentWithholdingServiceImpl.java b/src/com/engine/salary/service/impl/TaxPaymentWithholdingServiceImpl.java index 67b2a0c2a..930a0f201 100644 --- a/src/com/engine/salary/service/impl/TaxPaymentWithholdingServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxPaymentWithholdingServiceImpl.java @@ -56,7 +56,7 @@ public class TaxPaymentWithholdingServiceImpl extends AbstractTaxPaymentService } List statuses = getTaxDeclareRecordService(user).getTaxDeclareStatusByTaxDeclareRecordId(param.getTaxDeclareRecordId()); - for (TaxDeclareStatusPO status:statuses) { + for (TaxDeclareStatusPO status : statuses) { WithholdingFeedbackResponse.Feedback feedback = Optional.of(feedbackResponse) .map(WithholdingFeedbackResponse::getBody) .map(body -> { @@ -99,14 +99,13 @@ public class TaxPaymentWithholdingServiceImpl extends AbstractTaxPaymentService status.setTaxPaidAmount(totalPaid.toString()); status.setTaxPurePaidAmount(taxPurePaidAmount.add(taxPayAmount).toString()); status.setTaxPayAmount(BigDecimal.ZERO.toString()); - getTaxDeclareStatusService(user).updateTaxDeclareStatus(status); + getTaxDeclareStatusService(user).updateTaxDeclareStatus(status, false); } TaxAmountFormDTO taxAmountFormDTO = queryTaxAmount(param); -// // 更新个税申报记录状态为已缴款 -// TaxDeclareRecordPO taxDeclareRecord = new TaxDeclareRecordPO(); -// updateTaxDeclareRecord(param, totalPaid); + //更新主记录 + getTaxDeclareStatusService(user).updateRecord(param.getTaxDeclareRecordId()); // 更新缴款请求为已反馈 updateTaxPaymentRequest(param); diff --git a/src/com/engine/salary/service/impl/TaxPaymentWithholdingVoucherServiceImpl.java b/src/com/engine/salary/service/impl/TaxPaymentWithholdingVoucherServiceImpl.java index 9fec5d913..de73ad3bb 100644 --- a/src/com/engine/salary/service/impl/TaxPaymentWithholdingVoucherServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxPaymentWithholdingVoucherServiceImpl.java @@ -23,7 +23,6 @@ import com.engine.salary.enums.taxdeclaration.TaxPaymentStatusEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.util.*; import lombok.extern.slf4j.Slf4j; -import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.List; @@ -44,7 +43,6 @@ import java.util.stream.Collectors; public class TaxPaymentWithholdingVoucherServiceImpl extends AbstractTaxPaymentService { @Override - @Transactional(rollbackFor = Exception.class) public TaxFeedbackResultDTO getFeedback(TaxPaymentQueryParam param) { WithholdingVoucherFeedbackResponse feedbackResponse = (WithholdingVoucherFeedbackResponse) checkBeforeGetFeedbackResponse(param); // 校验请求结果 @@ -130,7 +128,6 @@ public class TaxPaymentWithholdingVoucherServiceImpl extends AbstractTaxPaymentS } @Override - @Transactional(rollbackFor = Exception.class) public void syncWithholdingFeedback(TaxPaymentQueryParam param) { TempWrapper tempWrapper = checkBeforeGetRequestIdResponse(param); SyncWithholdingFeedbackResponse response = getRequestIdResponse(tempWrapper.getTaxReturnPO(), tempWrapper.getTaxAgentPO().getName(), @@ -166,7 +163,6 @@ public class TaxPaymentWithholdingVoucherServiceImpl extends AbstractTaxPaymentS } @Override - @Transactional(rollbackFor = Exception.class) public void cancelWithholdingVoucher(TaxPaymentQueryParam param) { TempWrapper tempWrapper = checkBeforeGetRequestIdResponse(param); Map requestParam = DataCollectionBO.getApiBaseQueryParams(tempWrapper.getTaxReturnPO(), tempWrapper.getTaxAgentPO().getName(), SalaryDateUtil.getFormatYYYYMM(param.getTaxYearMonth())); diff --git a/src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java b/src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java index 10ef95a47..b6eaa2e0b 100644 --- a/src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java +++ b/src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java @@ -892,6 +892,6 @@ public class TaxDeclareRecordWrapper extends Service { } public List getTaxReports(Long id) { - return getTaxDeclareStatusService(user).getOrInitTaxReports(id); + return getTaxDeclareStatusService(user).updateRecord(id); } }