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

处理进行中的错误码

This commit is contained in:
钱涛 2024-08-01 11:43:26 +08:00
parent c179a9aedf
commit 1ede373638
6 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/com/engine/salary/enums/salarysob/IncomeCategoryEnum.java
View File

@ -570,23 +570,24 @@ public enum IncomeCategoryEnum implements BaseEnum<Integer> {
public abstract Map<Long, SalarySobTaxRuleDTO> parseGetASynIndividualIncomeTaxFeedbackResponse(GetASynIndividualIncomeTaxFeedbackResponse declareTaxResultFeedbackResponse, List<EmployeeDeclarePO> employeeDeclares, SalarySobTaxRuleDTO taxRuleDTO);
private static void checkGetASynIndividualIncomeTaxFeedbackResponse(GetASynIndividualIncomeTaxFeedbackResponse feedbackResponse){
private static void checkGetASynIndividualIncomeTaxFeedbackResponse(GetASynIndividualIncomeTaxFeedbackResponse feedbackResponse) {
if (Objects.isNull(feedbackResponse) || Objects.isNull(feedbackResponse.getHead())) {
throw new OnlineCalculateTaxException(SalaryI18nUtil.getI18nLabel(156449, "服务异常"));
}
if (Objects.equals(feedbackResponse.getHead().getCode(), SzyhApiConstant.HANDLING_CODE) || Objects.equals(feedbackResponse.getHead().getCode(), SzyhApiConstant.TASK_HANDLING_CODE)) {
throw new SalaryRunTimeException(feedbackResponse.getHead().getMsg());
}
if (!Objects.equals(feedbackResponse.getHead().getCode(), SzyhApiConstant.SUCCESS_CODE)) {
throw new OnlineCalculateTaxException(feedbackResponse.getHead().getMsg());
}
List<GetASynIndividualIncomeTaxFeedbackResponse.Body.rysbsb> rysbsblb = feedbackResponse.getBody().getRysbsblb();
if (CollectionUtil.isNotEmpty(rysbsblb)) {
String err = rysbsblb.stream().map(GetASynIndividualIncomeTaxFeedbackResponse.Body.rysbsb::getSbyy).collect(Collectors.joining(";"));
throw new OnlineCalculateTaxException(err);
}
}
if (Objects.isNull(feedbackResponse) || Objects.isNull(feedbackResponse.getHead())) {
throw new OnlineCalculateTaxException(SalaryI18nUtil.getI18nLabel(156449, "服务异常"));
}
if (Objects.equals(feedbackResponse.getHead().getCode(), SzyhApiConstant.TASK_HANDLING_CODE)) {
throw new SalaryRunTimeException(feedbackResponse.getHead().getMsg());
}
if (!Objects.equals(feedbackResponse.getHead().getCode(), SzyhApiConstant.SUCCESS_CODE)) {
throw new OnlineCalculateTaxException(feedbackResponse.getHead().getMsg());
}
List<GetASynIndividualIncomeTaxFeedbackResponse.Body.rysbsb> rysbsblb = feedbackResponse.getBody().getRysbsblb();
if(CollectionUtil.isNotEmpty(rysbsblb)){
String err = rysbsblb.stream().map(GetASynIndividualIncomeTaxFeedbackResponse.Body.rysbsb::getSbyy).collect(Collectors.joining(";"));
throw new OnlineCalculateTaxException(err);
}
}
public Map<String, List<List<Object>>> parseGetCompanyIncomesResponse(Map<String, List<List<Object>>> result, GetCompanyIncomesResponse response) {
List<GetCompanyIncomesResponse.sfmx> sfmx = Optional.ofNullable(response.getBody().getSfmx())
.orElse(new ArrayList<>())

2
src/com/engine/salary/remote/tax/client/CalculateClient.java
View File

@ -26,7 +26,7 @@ public class CalculateClient extends TaxBaseClient{
String res = HttpUtil.getRequest(url, header, params);
TaskUtil taskUtil = new TaskUtil();
taskUtil.writeApiTaskRecord(requestId, url, requestId, res);
log.info("getDeclareTaxResultFeedback res --- {}", res);
log.info("getASynIndividualIncomeTaxFeedback res --- {}", res);
return JsonUtil.parseObject(res, GetASynIndividualIncomeTaxFeedbackResponse.class);
}

2
src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
View File

@ -1678,7 +1678,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
// 校验请求结果
String responseCode = Optional.ofNullable(response).map(QuerySpecialAmountFeedbackResponse::getHead).map(SzyhResponseHead::getCode).orElse(null);
String msg = Optional.ofNullable(response).map(QuerySpecialAmountFeedbackResponse::getHead).map(SzyhResponseHead::getMsg).orElse(null);
if (SzyhApiConstant.HANDLING_CODE.equals(responseCode)) {
if (SzyhApiConstant.HANDLING_CODE.equals(responseCode)||SzyhApiConstant.TASK_HANDLING_CODE.equals(responseCode)) {
// 如果接口仍在处理中，则继续轮询
return AddUpDeductionRequestResultDTO.builder().finish(false).build();
}

2
src/com/engine/salary/service/impl/TaxPaymentAgreementServiceImpl.java
View File

@ -39,7 +39,7 @@ public class TaxPaymentAgreementServiceImpl extends AbstractTaxPaymentService {
String responseCode = Optional.ofNullable(feedbackResponse).map(AgreementQueryFeedbackResponse::getHead).map(SzyhResponseHead::getCode).orElse(null);
String msg = Optional.ofNullable(feedbackResponse).map(AgreementQueryFeedbackResponse::getHead).map(SzyhResponseHead::getMsg).orElse(null);
TaxAgreementFormDTO agreementFormDTO = new TaxAgreementFormDTO();
if (SzyhApiConstant.HANDLING_CODE.equals(responseCode)) {
if (SzyhApiConstant.HANDLING_CODE.equals(responseCode)||SzyhApiConstant.TASK_HANDLING_CODE.equals(responseCode)) {
// 如果接口仍在处理中，则继续轮询
return agreementFormDTO.setFinish(false);
}

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

@ -45,7 +45,7 @@ public class TaxPaymentWithholdingServiceImpl extends AbstractTaxPaymentService
// 校验请求结果
String responseCode = Optional.ofNullable(feedbackResponse).map(WithholdingFeedbackResponse::getHead).map(SzyhResponseHead::getCode).orElse(null);
String msg = Optional.ofNullable(feedbackResponse).map(WithholdingFeedbackResponse::getHead).map(SzyhResponseHead::getMsg).orElse(null);
if (SzyhApiConstant.HANDLING_CODE.equals(responseCode)) {
if (SzyhApiConstant.HANDLING_CODE.equals(responseCode)||SzyhApiConstant.TASK_HANDLING_CODE.equals(responseCode)) {
// 如果接口仍在处理中，则继续轮询
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(175337, "缴款还在处理中，请稍后点击缴款反馈"));
}

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

@ -49,7 +49,7 @@ public class TaxPaymentWithholdingVoucherServiceImpl extends AbstractTaxPaymentS
// 校验请求结果
String responseCode = Optional.ofNullable(feedbackResponse).map(WithholdingVoucherFeedbackResponse::getHead).map(SzyhResponseHead::getCode).orElse(null);
String msg = Optional.ofNullable(feedbackResponse).map(WithholdingVoucherFeedbackResponse::getHead).map(SzyhResponseHead::getMsg).orElse(null);
if (SzyhApiConstant.HANDLING_CODE.equals(responseCode)) {
if (SzyhApiConstant.HANDLING_CODE.equals(responseCode)||SzyhApiConstant.TASK_HANDLING_CODE.equals(responseCode)) {
// 如果接口仍在处理中，则继续轮询
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(175337, "缴款还在处理中，请稍后点击缴款反馈"));
}