三方缴款接口更新

src/com/engine/salary/constant/SzyhApiConstant.java

@@ -205,6 +205,11 @@ public class SzyhApiConstant {
      */
     public static final String HANDLING_CODE = "000004";
 
+    /**
+     * 异步计算任务还未结束
+     */
+    public static final String TASK_HANDLING_CODE = "100004";
+
     /**
      * 企业服务不可用
      */

src/com/engine/salary/entity/taxpayment/param/TaxPaymentQueryParam.java

@@ -1,5 +1,6 @@
 package com.engine.salary.entity.taxpayment.param;
 
+import com.engine.salary.enums.taxdeclaration.TaxPaymentServiceTypeEnum;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
@@ -10,10 +11,12 @@ import java.util.Date;
 
 /**
  * 查询企业三方信息
+ * <p>Copyright: Copyright (c) 2024</p>
+ * <p>Company: 泛微软件</p>
  *
- * @author chengliming
+ * @author qiantao
- * @date: 2022-12-06 17:25:28
+ * @version 1.0
- */
+ **/
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
@@ -31,7 +34,7 @@ public class TaxPaymentQueryParam {
     private Long taxDeclareRecordId;
 
     /**
-     *  TaxPaymentServiceTypeEnum
+     * @see TaxPaymentServiceTypeEnum
      */
     //业务类型")
     private Integer type;
@@ -39,6 +42,11 @@ public class TaxPaymentQueryParam {
     //三方协议号")
     private String protocolNumber;
 
+    /**
+     * 缴款帐号
+     */
+    private String paymentNumber;
+
     //应缴税额")
     private String taxAmount;
 

src/com/engine/salary/remote/tax/client/TaxBaseClient.java

@@ -105,7 +105,7 @@ public class TaxBaseClient {
             }
             //  如果税友返回错误信息
             String code = response.getHead().getCode();
-            if (SzyhApiConstant.HANDLING_CODE.equals(code)) {
+            if (SzyhApiConstant.HANDLING_CODE.equals(code) || SzyhApiConstant.TASK_HANDLING_CODE.equals(code)) {
                 //进行中的任务，重试
                 try {
                     Thread.sleep(6 * 1000);
@@ -141,7 +141,7 @@ public class TaxBaseClient {
             }
             //  如果税友返回错误信息
             String code = response.getHead().getCode();
-            if (SzyhApiConstant.HANDLING_CODE.equals(code)) {
+            if (SzyhApiConstant.HANDLING_CODE.equals(code) || SzyhApiConstant.TASK_HANDLING_CODE.equals(code)) {
                 //进行中的任务，重试
                 try {
                     Thread.sleep(6 * 1000);

src/com/engine/salary/service/impl/SalaryCalcTaxServiceImpl.java

@@ -27,11 +27,13 @@ import com.engine.salary.remote.tax.response.calculate.GetASynIndividualIncomeTa
 import com.engine.salary.service.*;
 import com.engine.salary.util.*;
 import com.engine.salary.util.db.IdGenerator;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import weaver.hrm.User;
 
 import java.util.*;
 
+@Slf4j
 public class SalaryCalcTaxServiceImpl extends Service implements SalaryCalcTaxService {
 
 
@@ -231,7 +233,12 @@ public class SalaryCalcTaxServiceImpl extends Service implements SalaryCalcTaxSe
             if (Objects.isNull(feedbackResponse) || Objects.isNull(feedbackResponse.getHead())) {
                 throw new SalaryRunTimeException(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)) {
+                log.error("获取个税反馈失败，核算id：{} ，原因：{}", salaryAcctRecord.getId(), feedbackResponse.getHead().getMsg());
+                getSalaryAcctCalcTaxReqService(user).deleteByRecordId(salaryAcctRecord.getId());
                 throw new SalaryRunTimeException(feedbackResponse.getHead().getMsg());
             }
             List<SalaryAcctTaxAgentPO> subSalaryAcctTaxAgents = salaryAcctTaxAgentMap.get(salaryAcctCalcTaxReq.getTaxAgentId());

src/com/engine/salary/service/impl/TaxPaymentWithholdingServiceImpl.java

@@ -127,12 +127,20 @@ public class TaxPaymentWithholdingServiceImpl extends AbstractTaxPaymentService
                                                               TaxPaymentQueryParam param,
                                                               TaxDeclarationApiConfigPO apiConfig,
                                                               Class<T> clazz) {
-        SalaryAssert.notBlank(param.getProtocolNumber(), SalaryI18nUtil.getI18nLabel(184071, "三方缴费参数错误"));
+        String protocolNumber = param.getProtocolNumber();
+        String paymentNumber = param.getPaymentNumber();
+        Integer reportType = param.getReportType();
+        String taxAmount = param.getTaxAmount();
+        SalaryAssert.notBlank(protocolNumber, SalaryI18nUtil.getI18nLabel(184071, "三方协议号为空"));
+        SalaryAssert.notBlank(paymentNumber, SalaryI18nUtil.getI18nLabel(184071, "缴款帐号为空"));
+        SalaryAssert.notNull(reportType, SalaryI18nUtil.getI18nLabel(184071, "报表类型为空"));
+        SalaryAssert.notBlank(taxAmount, SalaryI18nUtil.getI18nLabel(184071, "应纳税额为空"));
         String url = apiConfig.getHost() + SzyhApiConstant.DECLARE_WITH_HOLDING;
         Map<String, Object> requestParam = DataCollectionBO.getApiBaseQueryParams(returnPO, taxAgentName, SalaryDateUtil.getFormatYYYYMM(param.getTaxYearMonth()));
-        requestParam.put("sfxyh", param.getProtocolNumber());
+        requestParam.put("sfxyh", protocolNumber);
-//        requestParam.put("ynse", param.getTaxAmount());
+        requestParam.put("jkzh", paymentNumber);
-//        requestParam.put("sblx", "1");
+        requestParam.put("bblx", reportType);
+        requestParam.put("ynse", taxAmount);
         return postRequest(apiConfig, url, requestParam, clazz);
     }
 

src/com/engine/salary/wrapper/SalarySobWrapper.java

@@ -18,6 +18,7 @@ import com.engine.salary.entity.salarysob.po.SalarySobBackItemPO;
 import com.engine.salary.entity.salarysob.po.SalarySobDefaultBackItemPO;
 import com.engine.salary.entity.salarysob.po.SalarySobPO;
 import com.engine.salary.entity.taxagent.po.TaxAgentPO;
+import com.engine.salary.enums.salarysob.DeclareReportTypeEnum;
 import com.engine.salary.enums.salarysob.IncomeCategoryEnum;
 import com.engine.salary.enums.sicategory.DeleteTypeEnum;
 import com.engine.salary.exception.SalaryRunTimeException;
@@ -71,7 +72,6 @@ public class SalarySobWrapper extends Service {
     }
 
 
-
     /**
      * 薪资账套列表
      *
@@ -269,18 +269,19 @@ public class SalarySobWrapper extends Service {
         return taxAgentIds.contains(salarySobPO.getTaxAgentId()) || Objects.isNull(salarySobPO.getTaxAgentId());
     }
 
-    public  List<Map<String, Object>> incomeCategoryList() {
+    public List<Map<String, Object>> incomeCategoryList() {
-        IncomeCategoryEnum[] values = IncomeCategoryEnum.values();
+        List<Map<String, Object>> list = new ArrayList<>();
-        List<Map<String, Object>> list = new ArrayList<>(values.length);
+        Arrays.stream(IncomeCategoryEnum.values())
-        for (IncomeCategoryEnum value : values) {
+                .filter(incomeCategory -> incomeCategory.getReportType() == DeclareReportTypeEnum.COMPREHENSIVE_INCOME)
-            Map<String, Object> map = new HashMap<String, Object>();
+                .forEach(incomeCategory -> {
-            map.put("enum", value);
+                    Map<String, Object> map = new HashMap<String, Object>();
-            map.put("value", value.getValue());
+                    map.put("enum", incomeCategory);
-            map.put("defaultLabel", value.getDefaultLabel());
+                    map.put("value", incomeCategory.getValue());
-            map.put("labelId", value.getLabelId());
+                    map.put("defaultLabel", incomeCategory.getDefaultLabel());
-            map.put("reportTypeName", value.getReportType().getDefaultLabel());
+                    map.put("labelId", incomeCategory.getLabelId());
-            list.add(map);
+                    map.put("reportTypeName", incomeCategory.getReportType().getDefaultLabel());
-        }
+                    list.add(map);
+                });
         return list;
     }
 }