diff --git a/resource/sqlupgrade/DM/sql202507110103.sql b/resource/sqlupgrade/DM/sql202507110103.sql
new file mode 100644
index 000000000..a942c94e6
--- /dev/null
+++ b/resource/sqlupgrade/DM/sql202507110103.sql
@@ -0,0 +1,3 @@
+alter table hrsa_tax_payment_request add report_type number(11) null;
+/
+
diff --git a/resource/sqlupgrade/GS/sql202507110103.sql b/resource/sqlupgrade/GS/sql202507110103.sql
new file mode 100644
index 000000000..a942c94e6
--- /dev/null
+++ b/resource/sqlupgrade/GS/sql202507110103.sql
@@ -0,0 +1,3 @@
+alter table hrsa_tax_payment_request add report_type number(11) null;
+/
+
diff --git a/resource/sqlupgrade/JC/sql202507110103.sql b/resource/sqlupgrade/JC/sql202507110103.sql
new file mode 100644
index 000000000..a942c94e6
--- /dev/null
+++ b/resource/sqlupgrade/JC/sql202507110103.sql
@@ -0,0 +1,3 @@
+alter table hrsa_tax_payment_request add report_type number(11) null;
+/
+
diff --git a/resource/sqlupgrade/Mysql/sql202507110103.sql b/resource/sqlupgrade/Mysql/sql202507110103.sql
new file mode 100644
index 000000000..ab9b6cb2e
--- /dev/null
+++ b/resource/sqlupgrade/Mysql/sql202507110103.sql
@@ -0,0 +1 @@
+ALTER TABLE hrsa_tax_payment_request ADD COLUMN report_type int NULL;
\ No newline at end of file
diff --git a/resource/sqlupgrade/Oracle/sql202507110103.sql b/resource/sqlupgrade/Oracle/sql202507110103.sql
new file mode 100644
index 000000000..40452d2a6
--- /dev/null
+++ b/resource/sqlupgrade/Oracle/sql202507110103.sql
@@ -0,0 +1,2 @@
+alter table hrsa_tax_payment_request add report_type number(11) null
+/
\ No newline at end of file
diff --git a/resource/sqlupgrade/PG/sql202507110103.sql b/resource/sqlupgrade/PG/sql202507110103.sql
new file mode 100644
index 000000000..b59e15941
--- /dev/null
+++ b/resource/sqlupgrade/PG/sql202507110103.sql
@@ -0,0 +1 @@
+ALTER TABLE hrsa_tax_payment_request ADD COLUMN report_type int ;
\ No newline at end of file
diff --git a/resource/sqlupgrade/SQLServer/sql202507110103.sql b/resource/sqlupgrade/SQLServer/sql202507110103.sql
new file mode 100644
index 000000000..19d102aa7
--- /dev/null
+++ b/resource/sqlupgrade/SQLServer/sql202507110103.sql
@@ -0,0 +1,2 @@
+alter table hrsa_tax_payment_request add report_type int null
+go
\ No newline at end of file
diff --git a/resource/sqlupgrade/ST/sql202507110103.sql b/resource/sqlupgrade/ST/sql202507110103.sql
new file mode 100644
index 000000000..a942c94e6
--- /dev/null
+++ b/resource/sqlupgrade/ST/sql202507110103.sql
@@ -0,0 +1,3 @@
+alter table hrsa_tax_payment_request add report_type number(11) null;
+/
+
diff --git a/src/com/engine/salary/entity/taxpayment/po/TaxPaymentRequestPO.java b/src/com/engine/salary/entity/taxpayment/po/TaxPaymentRequestPO.java
index 34141f5a2..55e0c69c5 100644
--- a/src/com/engine/salary/entity/taxpayment/po/TaxPaymentRequestPO.java
+++ b/src/com/engine/salary/entity/taxpayment/po/TaxPaymentRequestPO.java
@@ -73,6 +73,8 @@ public class TaxPaymentRequestPO implements Serializable {
//是否已获取反馈")
private Integer feedback;
+ private Integer reportType;
+
/**
* 租户key
*/
diff --git a/src/com/engine/salary/mapper/taxpayment/TaxPaymentRequestMapper.java b/src/com/engine/salary/mapper/taxpayment/TaxPaymentRequestMapper.java
index 6ec65e30f..d33063ed7 100644
--- a/src/com/engine/salary/mapper/taxpayment/TaxPaymentRequestMapper.java
+++ b/src/com/engine/salary/mapper/taxpayment/TaxPaymentRequestMapper.java
@@ -79,8 +79,6 @@ public interface TaxPaymentRequestMapper {
void updateFeedbackByRequestTypeTaxAgentIdTaxYearMonth(TaxPaymentRequestPO build);
- void updateFeedbackByTaxDeclareRecordId(TaxPaymentRequestPO build);
-
TaxPaymentRequestPO getOne(TaxPaymentRequestPO build);
}
\ No newline at end of file
diff --git a/src/com/engine/salary/mapper/taxpayment/TaxPaymentRequestMapper.xml b/src/com/engine/salary/mapper/taxpayment/TaxPaymentRequestMapper.xml
index d1ca5dee2..6d84c59b8 100644
--- a/src/com/engine/salary/mapper/taxpayment/TaxPaymentRequestMapper.xml
+++ b/src/com/engine/salary/mapper/taxpayment/TaxPaymentRequestMapper.xml
@@ -14,6 +14,7 @@
+
@@ -32,6 +33,7 @@
, t.tax_year_month
, t.tenant_key
, t.update_time
+ , t.report_type
@@ -93,6 +95,9 @@
AND update_time = #{updateTime}
+
+ AND report_type = #{reportType}
+
AND id IN
@@ -142,7 +147,10 @@
tenant_key,
- update_time
+ update_time,
+
+
+ report_type
@@ -180,7 +188,10 @@
#{tenantKey},
- #{updateTime}
+ #{updateTime},
+
+
+ #{reportType}
@@ -201,7 +212,8 @@
tax_declare_record_id,
tax_year_month,
tenant_key,
- update_time
+ update_time,
+ report_type
)
VALUES
(
@@ -217,7 +229,8 @@
#{item.taxDeclareRecordId},
#{item.taxYearMonth},
#{item.tenantKey},
- #{item.updateTime}
+ #{item.updateTime},
+ #{item.reportType}
)
@@ -236,7 +249,8 @@
tax_declare_record_id,
tax_year_month,
tenant_key,
- update_time
+ update_time,
+ report_type
)
@@ -252,7 +266,8 @@
#{item.taxDeclareRecordId,jdbcType=DOUBLE},
#{item.taxYearMonth,jdbcType=DATE},
#{item.tenantKey,jdbcType=VARCHAR},
- #{item.updateTime,jdbcType=DATE}
+ #{item.updateTime,jdbcType=DATE},
+ #{item.reportType,jdbcType=INTEGER}
from dual
@@ -272,7 +287,8 @@
tax_declare_record_id,
tax_year_month,
tenant_key,
- update_time
+ update_time,
+ report_type
)
VALUES
(
@@ -287,7 +303,8 @@
#{item.taxDeclareRecordId},
#{item.taxYearMonth},
#{item.tenantKey},
- #{item.updateTime}
+ #{item.updateTime},
+ #{item.reportType}
)
@@ -307,6 +324,7 @@
tax_year_month=#{taxYearMonth},
tenant_key=#{tenantKey},
update_time=#{updateTime},
+ report_type=#{reportType},
WHERE id = #{id} AND delete_type = 0
@@ -349,6 +367,9 @@
update_time=#{updateTime},
+
+ report_type=#{reportType},
+
WHERE id = #{id} AND delete_type = 0
@@ -385,17 +406,9 @@
AND request_type=#{requestType}
AND tax_agent_id=#{taxAgentId}
AND tax_year_month=#{taxYearMonth}
+ AND report_type=#{reportType}
-
- UPDATE hrsa_tax_payment_request
-
- feedback=#{feedback}
-
- WHERE delete_type = 0
- AND tax_declare_record_id=#{taxDeclareRecordId}
-
@@ -407,6 +420,7 @@
AND request_type = #{requestType}
AND tax_agent_id = #{taxAgentId}
AND tax_year_month = #{taxYearMonth}
+ AND report_type = #{reportType}
\ No newline at end of file
diff --git a/src/com/engine/salary/service/impl/AbstractTaxPaymentService.java b/src/com/engine/salary/service/impl/AbstractTaxPaymentService.java
index 25078bcf0..0881fd6cf 100644
--- a/src/com/engine/salary/service/impl/AbstractTaxPaymentService.java
+++ b/src/com/engine/salary/service/impl/AbstractTaxPaymentService.java
@@ -11,6 +11,7 @@ import com.engine.salary.entity.taxagent.po.TaxAgentTaxReturnPO;
import com.engine.salary.entity.taxagent.response.SzyhResponseHead;
import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationApiConfigPO;
import com.engine.salary.entity.taxdeclaration.po.TaxDeclareRecordPO;
+import com.engine.salary.entity.taxdeclaration.po.TaxDeclareStatusPO;
import com.engine.salary.entity.taxpayment.dto.TaxAmountFormDTO;
import com.engine.salary.entity.taxpayment.dto.TaxFeedbackResultDTO;
import com.engine.salary.entity.taxpayment.dto.TaxWithheldVoucherResultDTO;
@@ -34,7 +35,6 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import weaver.hrm.User;
-import java.math.BigDecimal;
import java.util.*;
/**
@@ -54,6 +54,7 @@ public abstract class AbstractTaxPaymentService extends Service implements TaxPa
protected TaxDeclareStatusService getTaxDeclareStatusService(User user) {
return ServiceUtil.getService(TaxDeclareStatusServiceImpl.class, user);
}
+
protected TaxAgentService getTaxAgentService(User user) {
return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
}
@@ -172,6 +173,7 @@ public abstract class AbstractTaxPaymentService extends Service implements TaxPa
.requestType(param.getType())
.taxAgentId(param.getTaxAgentId())
.taxYearMonth(param.getTaxYearMonth())
+ .reportType(param.getReportType())
.build());
}
} else {
@@ -189,6 +191,7 @@ public abstract class AbstractTaxPaymentService extends Service implements TaxPa
.requestId(requestId)
.requestType(param.getType())
.feedback(SalaryOnOffEnum.OFF.getValue())
+ .reportType(param.getReportType())
.build();
getTaxPaymentRequestMapper().insertIgnoreNull(paymentRequestPO);
}
@@ -200,6 +203,7 @@ public abstract class AbstractTaxPaymentService extends Service implements TaxPa
.builder()
.taxAgentId(param.getTaxAgentId())
.taxYearMonth(param.getTaxYearMonth())
+ .reportType(param.getReportType())
.build());
if (Objects.isNull(param.getCheckFeedback()) || SalaryOnOffEnum.ON.getValue().equals(param.getCheckFeedback())) {
TaxPaymentRequestPO notFeedback = paymentRequests.stream()
@@ -226,6 +230,7 @@ public abstract class AbstractTaxPaymentService extends Service implements TaxPa
.requestType(getServiceType())
.taxAgentId(param.getTaxAgentId())
.taxYearMonth(param.getTaxYearMonth())
+ .reportType(param.getReportType())
.build());
SalaryAssert.notNull(paymentRequest, "请先点击[三方缴款]或[银行端凭证缴款]按钮发起缴款请求后，再点击[缴款反馈]按钮");
paymentRequest.setFeedback(SalaryOnOffEnum.ON.getValue());
@@ -256,10 +261,11 @@ public abstract class AbstractTaxPaymentService extends Service implements TaxPa
public TaxAmountFormDTO queryTaxAmount(TaxPaymentQueryParam param) {
TaxDeclareRecordPO taxDeclareRecord = getTaxDeclareRecordService(user).getById(param.getTaxDeclareRecordId());
SalaryAssert.notNull(taxDeclareRecord, "个税申报记录不存在");
- if (!TaxDeclareStatusEnum.DECLARE_SUCCESS_UNPAID.getValue().equals(taxDeclareRecord.getTaxDeclareStatus())) {
+ TaxDeclareStatusPO taxDeclareStatus = getTaxDeclareStatusService(user).getTaxDeclareStatus(param.getTaxDeclareRecordId(), param.getReportType());
+ if (!TaxDeclareStatusEnum.DECLARE_SUCCESS_UNPAID.getValue().equals(taxDeclareStatus.getTaxDeclareStatus())) {
throw new SalaryRunTimeException("当前申报状态不是[申报成功，未缴费]，暂时无法获取");
}
- if (taxDeclareRecord.getTaxPayAmount() == null || taxDeclareRecord.getPersonNum() == null) {
+ if (taxDeclareStatus.getTaxPayAmount() == null || taxDeclareStatus.getPersonNum() == null) {
throw new SalaryRunTimeException("未获取到应缴信息，请先进行个税在线申报");
}
TaxAgentPO taxAgentPO = getTaxAgentService(user).getById(taxDeclareRecord.getTaxAgentId());
@@ -267,32 +273,11 @@ public abstract class AbstractTaxPaymentService extends Service implements TaxPa
return TaxAmountFormDTO.builder()
.taxAgent(taxAgentPO.getName())
- .amount(SalaryEntityUtil.thousandthConvert(taxDeclareRecord.getTaxPayAmount()))
- .personNum(taxDeclareRecord.getPersonNum().toString())
+ .amount(SalaryEntityUtil.thousandthConvert(taxDeclareStatus.getTaxPayAmount()))
+ .personNum(taxDeclareStatus.getPersonNum().toString())
.build();
}
- protected TaxDeclareRecordPO updateTaxDeclareRecord(TaxPaymentQueryParam param, BigDecimal totalPaid) {
- TaxDeclareRecordPO taxDeclareRecord = getTaxDeclareRecordService(user).getById(param.getTaxDeclareRecordId());
- if (TaxDeclareStatusEnum.DECLARE_SUCCESS_PAID.getValue().equals(taxDeclareRecord.getTaxDeclareStatus())) {
- throw new SalaryRunTimeException("当前申报表状态为已缴款，无法更新状态");
- }
- BigDecimal taxPayAmount = SalaryEntityUtil.empty2Zero(taxDeclareRecord.getTaxPayAmount());
- BigDecimal taxPurePaidAmount = SalaryEntityUtil.empty2Zero(taxDeclareRecord.getTaxPurePaidAmount());
- if (SalaryEntityUtil.empty2Zero(taxDeclareRecord.getTaxPaidAmount()).equals(totalPaid)
- && taxPayAmount.compareTo(BigDecimal.ZERO) > 0) {
- throw new SalaryRunTimeException("请进行缴款后再刷新缴款状态");
- }
- taxDeclareRecord.setTaxDeclareStatus(TaxDeclareStatusEnum.DECLARE_SUCCESS_PAID.getValue());
- taxDeclareRecord.setTaxPaidAmount(totalPaid.toString());
- taxDeclareRecord.setTaxPurePaidAmount(taxPurePaidAmount.add(taxPayAmount).toString());
- taxDeclareRecord.setTaxPayAmount(BigDecimal.ZERO.toString());
- taxDeclareRecord.setUpdateTime(new Date());
- getTaxDeclareRecordService(user).updateById(taxDeclareRecord);
- // 填充回去后续返回数据用
- taxDeclareRecord.setTaxPayAmount(taxPayAmount.toString());
- return taxDeclareRecord;
- }
@Override
public void cancelWithholdingVoucher(TaxDeclarationApiConfigPO apiConfig, TaxDeclareRecordPO taxDeclareRecord, Map requestParam) {
diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
index 67aff3ecd..f869556b8 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
@@ -405,11 +405,13 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
if (openSum != null && StringUtils.isNotBlank(openSum.getConfValue()) && OpenEnum.parseByValue(openSum.getConfValue()) == OpenEnum.OPEN) {
total = true;
Map sumRow = getSalaryAcctResultService(user).sumRow(queryParam);
- sumRow.forEach((k, v) -> {
- if (NumberUtils.isCreatable(v.toString())) {
- sumRow.put(k, new BigDecimal(v.toString()));
- }
- });
+ if (sumRow != null) {
+ sumRow.forEach((k, v) -> {
+ if (NumberUtils.isCreatable(v.toString())) {
+ sumRow.put(k, new BigDecimal(v.toString()));
+ }
+ });
+ }
if (sumRow != null) {
sumRow.put("taxAgentName", "总计");
resultMapList.add(sumRow);
diff --git a/src/com/engine/salary/service/impl/TaxPaymentWithholdingServiceImpl.java b/src/com/engine/salary/service/impl/TaxPaymentWithholdingServiceImpl.java
index 2d85f020c..019701a54 100644
--- a/src/com/engine/salary/service/impl/TaxPaymentWithholdingServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxPaymentWithholdingServiceImpl.java
@@ -9,7 +9,6 @@ import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationApiConfigPO;
import com.engine.salary.entity.taxdeclaration.po.TaxDeclareRecordPO;
import com.engine.salary.entity.taxdeclaration.po.TaxDeclareStatusPO;
import com.engine.salary.entity.taxpayment.dto.TaxAgreementFeedbackResultDTO;
-import com.engine.salary.entity.taxpayment.dto.TaxAmountFormDTO;
import com.engine.salary.entity.taxpayment.dto.TaxFeedbackResultDTO;
import com.engine.salary.entity.taxpayment.param.TaxPaymentQueryParam;
import com.engine.salary.entity.taxpayment.response.BaseResponse;
@@ -23,7 +22,6 @@ import com.engine.salary.util.*;
import lombok.extern.slf4j.Slf4j;
import java.math.BigDecimal;
-import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
@@ -55,53 +53,57 @@ public class TaxPaymentWithholdingServiceImpl extends AbstractTaxPaymentService
throw new SalaryRunTimeException(msg);
}
- List statuses = getTaxDeclareStatusService(user).getTaxDeclareStatusByTaxDeclareRecordId(param.getTaxDeclareRecordId());
- for (TaxDeclareStatusPO status : statuses) {
- WithholdingFeedbackResponse.Feedback feedback = Optional.of(feedbackResponse)
- .map(WithholdingFeedbackResponse::getBody)
- .map(body -> {
- if (Objects.equals(status.getReportType(), DeclareReportTypeEnum.COMPREHENSIVE_INCOME.getValue())) {
- return body.getZhsdjk();
- } else if (Objects.equals(status.getReportType(), DeclareReportTypeEnum.CLASSIFIED_INCOME.getValue())) {
- return body.getFlsdjk();
- } else if (Objects.equals(status.getReportType(), DeclareReportTypeEnum.NONRESIDENT_INCOME.getValue())) {
- return body.getFjmsdjk();
- } else {
- return body.getXsgsdjk();
- }
+ TaxDeclareStatusPO status = getTaxDeclareStatusService(user).getTaxDeclareStatus(param.getTaxDeclareRecordId(),param.getReportType());
+ WithholdingFeedbackResponse.Feedback feedback = Optional.of(feedbackResponse)
+ .map(WithholdingFeedbackResponse::getBody)
+ .map(body -> {
+ if (Objects.equals(status.getReportType(), DeclareReportTypeEnum.COMPREHENSIVE_INCOME.getValue())) {
+ return body.getZhsdjk();
+ } else if (Objects.equals(status.getReportType(), DeclareReportTypeEnum.CLASSIFIED_INCOME.getValue())) {
+ return body.getFlsdjk();
+ } else if (Objects.equals(status.getReportType(), DeclareReportTypeEnum.NONRESIDENT_INCOME.getValue())) {
+ return body.getFjmsdjk();
+ } else {
+ return body.getXsgsdjk();
+ }
- })
- .orElse(null);
- if (feedback == null) {
- log.info("getAgreementQueryFeedbackResponse empty data error: {}", JSON.toJSONString(feedbackResponse));
- throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(175338, "税局接口错误，未返回有效数据"));
- }
- // 判断缴款状态是否成功
- Integer paymentStatus = SalaryEntityUtil.getIntValue(feedback.getJkzt(), -1);
- TaxPaymentStatusEnum paymentStatusEnum = SalaryEnumUtil.enumMatchByValue(paymentStatus, TaxPaymentStatusEnum.class);
- if (paymentStatusEnum != TaxPaymentStatusEnum.SUCCESS) {
- throw new SalaryRunTimeException(String.format("缴款失败，失败原因：%s，申报状态：%s", feedback.getJksbyy(), feedback.getSbzt()));
- }
- // 累计实缴金额
- BigDecimal totalPaid = feedback.getKkfhlb().stream().map(e -> new BigDecimal(e.getSjse())).reduce(BigDecimal.ZERO, BigDecimal::add);
-
- if (TaxDeclareStatusEnum.DECLARE_SUCCESS_PAID.getValue().equals(status.getTaxDeclareStatus())) {
- throw new SalaryRunTimeException("当前申报表状态为已缴款，无法更新状态");
- }
- BigDecimal taxPayAmount = SalaryEntityUtil.empty2Zero(status.getTaxPayAmount());
- BigDecimal taxPurePaidAmount = SalaryEntityUtil.empty2Zero(status.getTaxPurePaidAmount());
- if (SalaryEntityUtil.empty2Zero(status.getTaxPaidAmount()).equals(totalPaid)
- && taxPayAmount.compareTo(BigDecimal.ZERO) > 0) {
- throw new SalaryRunTimeException("请进行缴款后再刷新缴款状态");
- }
- status.setTaxDeclareStatus(TaxDeclareStatusEnum.DECLARE_SUCCESS_PAID.getValue());
- status.setTaxPaidAmount(totalPaid.toString());
- status.setTaxPurePaidAmount(taxPurePaidAmount.add(taxPayAmount).toString());
- status.setTaxPayAmount(BigDecimal.ZERO.toString());
- getTaxDeclareStatusService(user).updateTaxDeclareStatus(status, false);
+ })
+ .orElse(null);
+ if (feedback == null) {
+ // 更新缴款请求为已反馈
+ updateTaxPaymentRequest(param);
+ log.info("getAgreementQueryFeedbackResponse empty data error: {}", JSON.toJSONString(feedbackResponse));
+ throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(175338, "税局接口错误，未返回有效数据"));
}
+ // 判断缴款状态是否成功
+ Integer paymentStatus = SalaryEntityUtil.getIntValue(feedback.getJkzt(), -1);
+ TaxPaymentStatusEnum paymentStatusEnum = SalaryEnumUtil.enumMatchByValue(paymentStatus, TaxPaymentStatusEnum.class);
+ if (paymentStatusEnum != TaxPaymentStatusEnum.SUCCESS) {
+ // 更新缴款请求为已反馈
+ updateTaxPaymentRequest(param);
+ throw new SalaryRunTimeException(String.format("缴款失败，失败原因：%s，申报状态：%s", feedback.getJksbyy(), feedback.getSbzt()));
+ }
+ // 累计实缴金额
+ BigDecimal totalPaid = feedback.getKkfhlb().stream().map(e -> new BigDecimal(e.getSjse())).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ if (TaxDeclareStatusEnum.DECLARE_SUCCESS_PAID.getValue().equals(status.getTaxDeclareStatus())) {
+ // 更新缴款请求为已反馈
+ updateTaxPaymentRequest(param);
+ throw new SalaryRunTimeException("当前申报表状态为已缴款，无法更新状态");
+ }
+ BigDecimal taxPayAmount = SalaryEntityUtil.empty2Zero(status.getTaxPayAmount());
+ BigDecimal taxPurePaidAmount = SalaryEntityUtil.empty2Zero(status.getTaxPurePaidAmount());
+ if (SalaryEntityUtil.empty2Zero(status.getTaxPaidAmount()).equals(totalPaid) && taxPayAmount.compareTo(BigDecimal.ZERO) > 0) {
+ // 更新缴款请求为已反馈
+ updateTaxPaymentRequest(param);
+ throw new SalaryRunTimeException("请进行缴款后再刷新缴款状态");
+ }
+ status.setTaxDeclareStatus(TaxDeclareStatusEnum.DECLARE_SUCCESS_PAID.getValue());
+ status.setTaxPaidAmount(totalPaid.toString());
+ status.setTaxPurePaidAmount(taxPurePaidAmount.add(taxPayAmount).toString());
+ status.setTaxPayAmount(BigDecimal.ZERO.toString());
+ getTaxDeclareStatusService(user).updateTaxDeclareStatus(status, false);
- TaxAmountFormDTO taxAmountFormDTO = queryTaxAmount(param);
//更新主记录
getTaxDeclareStatusService(user).updateRecord(param.getTaxDeclareRecordId());
@@ -112,9 +114,9 @@ public class TaxPaymentWithholdingServiceImpl extends AbstractTaxPaymentService
BigDecimal otherAmount = SalaryEntityUtil.empty2Zero(declareRecordPO.getTaxPaidAmount()).subtract(SalaryEntityUtil.empty2Zero(declareRecordPO.getTaxPurePaidAmount()));
return new TaxAgreementFeedbackResultDTO()
- .setPayAmount(SalaryEntityUtil.thousandthConvert(SalaryEntityUtil.empty2Zero(declareRecordPO.getTaxPaidAmount()).toString()))
+ .setPayAmount(SalaryEntityUtil.thousandthConvert(SalaryEntityUtil.empty2Zero(status.getTaxPaidAmount()).toString()))
.setOtherAmount(SalaryEntityUtil.thousandthConvert(otherAmount.toString()))
- .setPersonNum(taxAmountFormDTO.getPersonNum());
+ .setPersonNum(status.getPersonNum().toString());
}
@Override
diff --git a/src/com/engine/salary/service/impl/TaxPaymentWithholdingVoucherServiceImpl.java b/src/com/engine/salary/service/impl/TaxPaymentWithholdingVoucherServiceImpl.java
index dda4b4f06..5acb92777 100644
--- a/src/com/engine/salary/service/impl/TaxPaymentWithholdingVoucherServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxPaymentWithholdingVoucherServiceImpl.java
@@ -106,14 +106,6 @@ public class TaxPaymentWithholdingVoucherServiceImpl extends AbstractTaxPaymentS
@Override
public void cancelWithholdingVoucher(TaxDeclarationApiConfigPO apiConfig, TaxDeclareRecordPO taxDeclareRecord, Map requestParam) {
- TaxPaymentRequestPO paymentRequestPO = getTaxPaymentRequestMapper().getOne(TaxPaymentRequestPO
- .builder()
- .requestType(TaxPaymentServiceTypeEnum.WITHHOLDING_VOUCHER.getValue())
- .taxAgentId(taxDeclareRecord.getTaxAgentId())
- .taxYearMonth(taxDeclareRecord.getTaxCycle())
- .build());
-// if (paymentRequestPO != null) {
-
List statuses = getTaxDeclareStatusService(user).getTaxDeclareStatusByTaxDeclareRecordId(taxDeclareRecord.getId());
TaxPaymentClient taxPaymentClient = new TaxPaymentClient(taxDeclareRecord.getTaxAgentId());
statuses.forEach(status -> {
@@ -128,9 +120,9 @@ public class TaxPaymentWithholdingVoucherServiceImpl extends AbstractTaxPaymentS
.requestType(TaxPaymentServiceTypeEnum.WITHHOLDING_VOUCHER.getValue())
.taxAgentId(taxDeclareRecord.getTaxAgentId())
.taxYearMonth(taxDeclareRecord.getTaxCycle())
+ .reportType(status.getReportType())
.build());
});
-// }
}
// @Override