qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去除作废接口限制

This commit is contained in:
钱涛 2023-12-12 17:18:56 +08:00
parent 4d573956c8
commit f53922a3ab
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/salary/entity/taxpayment/po/TaxPaymentRequestPO.java
View File

@ -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;

16
src/com/engine/salary/service/impl/AbstractTaxPaymentService.java
View File

@ -39,7 +39,6 @@ import java.math.BigDecimal;
import java.util.*;
/**
*
* <p>Copyright: Copyright (c) 2023</p>
* <p>Company: 泛微软件</p>
*
@ -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());

4
src/com/engine/salary/service/impl/TaxPaymentWithholdingServiceImpl.java
View File

@ -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) {

4
src/com/engine/salary/service/impl/TaxPaymentWithholdingVoucherServiceImpl.java
View File

@ -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