From f53922a3abe392ab9bdf02617bf6dfe7f8cde2f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 12 Dec 2023 17:18:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=BD=9C=E5=BA=9F=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxpayment/po/TaxPaymentRequestPO.java | 6 ++++-- .../service/impl/AbstractTaxPaymentService.java | 16 +++++++++------- .../impl/TaxPaymentWithholdingServiceImpl.java | 4 ++-- .../TaxPaymentWithholdingVoucherServiceImpl.java | 4 ++-- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/com/engine/salary/entity/taxpayment/po/TaxPaymentRequestPO.java b/src/com/engine/salary/entity/taxpayment/po/TaxPaymentRequestPO.java index 48c2a0973..34141f5a2 100644 --- a/src/com/engine/salary/entity/taxpayment/po/TaxPaymentRequestPO.java +++ b/src/com/engine/salary/entity/taxpayment/po/TaxPaymentRequestPO.java @@ -1,5 +1,7 @@ package com.engine.salary.entity.taxpayment.po; +import com.engine.salary.enums.SalaryOnOffEnum; +import com.engine.salary.enums.taxdeclaration.TaxPaymentServiceTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -58,7 +60,7 @@ public class TaxPaymentRequestPO implements Serializable { /** * 请求类型 * - * com.weaver.hrm.salary.enums.taxdeclaration.TaxPaymentServiceTypeEnum + * @see TaxPaymentServiceTypeEnum */ //异步请求ID") private Integer requestType; @@ -66,7 +68,7 @@ public class TaxPaymentRequestPO implements Serializable { /** * 是否已获取反馈 * - * com.weaver.hrm.salary.enums.salaryitem.SalaryOnOffEnum + *@see SalaryOnOffEnum */ //是否已获取反馈") private Integer feedback; diff --git a/src/com/engine/salary/service/impl/AbstractTaxPaymentService.java b/src/com/engine/salary/service/impl/AbstractTaxPaymentService.java index 2b001a10c..47647f058 100644 --- a/src/com/engine/salary/service/impl/AbstractTaxPaymentService.java +++ b/src/com/engine/salary/service/impl/AbstractTaxPaymentService.java @@ -39,7 +39,6 @@ import java.math.BigDecimal; import java.util.*; /** - * *

Copyright: Copyright (c) 2023

*

Company: 泛微软件

* @@ -202,12 +201,15 @@ public abstract class AbstractTaxPaymentService extends Service implements TaxPa .taxYearMonth(param.getTaxYearMonth()) .build()); if (Objects.isNull(param.getCheckFeedback()) || SalaryOnOffEnum.ON.getValue().equals(param.getCheckFeedback())) { - TaxPaymentRequestPO notFeedback = paymentRequests.stream().filter(e -> { - boolean conditionA = getServiceType().equals(e.getRequestType()) - || TaxPaymentServiceTypeEnum.QUERY_AGREEMENT.getValue().equals(e.getRequestType()); - boolean conditionB = SalaryOnOffEnum.OFF.getValue().equals(e.getFeedback()); - return !conditionA && conditionB; - }).findFirst().orElse(null); + TaxPaymentRequestPO notFeedback = paymentRequests.stream() + .filter(e -> { + boolean conditionA = getServiceType().equals(e.getRequestType()) + || TaxPaymentServiceTypeEnum.QUERY_AGREEMENT.getValue().equals(e.getRequestType()); + boolean conditionB = SalaryOnOffEnum.OFF.getValue().equals(e.getFeedback()); + return !conditionA && conditionB; + }) + .findFirst() + .orElse(null); if (Objects.nonNull(notFeedback)) { TaxPaymentServiceTypeEnum notFeedbackType = TaxPaymentServiceTypeEnum.parseByValue(notFeedback.getRequestType()); diff --git a/src/com/engine/salary/service/impl/TaxPaymentWithholdingServiceImpl.java b/src/com/engine/salary/service/impl/TaxPaymentWithholdingServiceImpl.java index 4e6c5180e..eab790615 100644 --- a/src/com/engine/salary/service/impl/TaxPaymentWithholdingServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxPaymentWithholdingServiceImpl.java @@ -117,7 +117,7 @@ public class TaxPaymentWithholdingServiceImpl extends AbstractTaxPaymentService .taxYearMonth(taxDeclareRecord.getTaxCycle()) .build()); - if (paymentRequestPO != null) { +// if (paymentRequestPO != null) { String url = apiConfig.getHost() + SzyhApiConstant.CANCEL_WITHHOLDING_VOUCHER; QuerySpecialAmountResponse cancelResponse = postRequest(apiConfig, url, requestParam, QuerySpecialAmountResponse.class); SzyhResponseHead head = Optional.ofNullable(cancelResponse).map(QuerySpecialAmountResponse::getHead) @@ -132,7 +132,7 @@ public class TaxPaymentWithholdingServiceImpl extends AbstractTaxPaymentService .taxAgentId(taxDeclareRecord.getTaxAgentId()) .taxYearMonth(taxDeclareRecord.getTaxCycle()) .build()); - } +// } } protected BaseResponse getFeedbackResponse(TaxDeclarationApiConfigPO apiConfig, String requestId) { diff --git a/src/com/engine/salary/service/impl/TaxPaymentWithholdingVoucherServiceImpl.java b/src/com/engine/salary/service/impl/TaxPaymentWithholdingVoucherServiceImpl.java index 048f286ab..44e895087 100644 --- a/src/com/engine/salary/service/impl/TaxPaymentWithholdingVoucherServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxPaymentWithholdingVoucherServiceImpl.java @@ -113,7 +113,7 @@ public class TaxPaymentWithholdingVoucherServiceImpl extends AbstractTaxPaymentS .taxAgentId(taxDeclareRecord.getTaxAgentId()) .taxYearMonth(taxDeclareRecord.getTaxCycle()) .build()); - if (paymentRequestPO != null) { +// if (paymentRequestPO != null) { String url = apiConfig.getHost() + SzyhApiConstant.CANCEL_WITHHOLDING_VOUCHER; QuerySpecialAmountResponse cancelResponse = postRequest(apiConfig, url, requestParam, QuerySpecialAmountResponse.class); SzyhResponseHead head = Optional.ofNullable(cancelResponse).map(QuerySpecialAmountResponse::getHead) @@ -126,7 +126,7 @@ public class TaxPaymentWithholdingVoucherServiceImpl extends AbstractTaxPaymentS .taxAgentId(taxDeclareRecord.getTaxAgentId()) .taxYearMonth(taxDeclareRecord.getTaxCycle()) .build()); - } +// } } @Override