From 045873525c429ed18214e2782dfefe58c4aadb68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 5 Dec 2023 14:58:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E4=BA=91=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8A=A5=E7=A8=8E=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../remote/tax/client/DeclareClient.java      | 31 +++++++++++++++++++
 .../service/TaxDeclareRecordService.java      |  8 +++++
 .../impl/TaxDeclareRecordServiceImpl.java     | 12 +++++++
 .../salary/web/TaxDeclarationController.java  | 15 +++++++++
 .../wrapper/TaxDeclareRecordWrapper.java      |  5 +++
 5 files changed, 71 insertions(+)
 create mode 100644 src/com/engine/salary/remote/tax/client/DeclareClient.java

diff --git a/src/com/engine/salary/remote/tax/client/DeclareClient.java b/src/com/engine/salary/remote/tax/client/DeclareClient.java
new file mode 100644
index 000000000..3f5722b24
--- /dev/null
+++ b/src/com/engine/salary/remote/tax/client/DeclareClient.java
@@ -0,0 +1,31 @@
+package com.engine.salary.remote.tax.client;
+
+import com.engine.salary.util.HttpUtil;
+import com.engine.salary.util.SingnatureData;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public class DeclareClient extends TaxBaseClient{
+    public DeclareClient(Long taxAgentId) {
+        super(taxAgentId);
+    }
+
+    /**
+     * 申报内置算税结果查询
+     * @param requestId·
+     * @return
+     */
+    public  Object getDeclareTaxResultFeedback(String requestId){
+        // 供应商信息
+        String url = super.apiConfig.getHost() + "/gateway/iit/report/getDeclareTaxResultFeedback";
+        Map<String, String> params = new HashMap<>(1);
+        params.put("requestId", requestId);
+        Map<String, String> header = SingnatureData.initHeader(Collections.emptyMap(), apiConfig.getAppKey(), apiConfig.getAppSecret());
+        String res = HttpUtil.getRequest(url, header, params);
+        return res;
+    }
+
+
+}
diff --git a/src/com/engine/salary/service/TaxDeclareRecordService.java b/src/com/engine/salary/service/TaxDeclareRecordService.java
index c21ad68a7..4c325a520 100644
--- a/src/com/engine/salary/service/TaxDeclareRecordService.java
+++ b/src/com/engine/salary/service/TaxDeclareRecordService.java
@@ -131,6 +131,14 @@ public interface TaxDeclareRecordService  {
      */
     void getDeclareFeedback(Long id, TaxDeclarationRateDTO taxDeclarationRate);
 
+
+    /**
+     * 申报内置算税结果查询
+     * @param id
+     * @return
+     */
+    Object getDeclareTaxResultFeedback(Long id);
+
     /**
      * 作废
      *
diff --git a/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
index 1e5268e74..109ef366c 100644
--- a/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
@@ -40,6 +40,7 @@ import com.engine.salary.enums.taxagent.TaxAgentTaxReturnStatusEnum;
 import com.engine.salary.enums.taxdeclaration.*;
 import com.engine.salary.exception.SalaryRunTimeException;
 import com.engine.salary.mapper.taxdeclaration.TaxDeclareRecordMapper;
+import com.engine.salary.remote.tax.client.DeclareClient;
 import com.engine.salary.service.*;
 import com.engine.salary.service.factory.TaxPaymentServiceFactory;
 import com.engine.salary.util.*;
@@ -913,6 +914,17 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
 //        taxDeclarationLoggerTemplate.write(loggerContext);
     }
 
+
+    @Override
+    public Object getDeclareTaxResultFeedback(Long id) {
+        TaxDeclareRequest taxDeclareRequest = buildTaxDeclareRequest(id);
+        TaxDeclareRecordPO taxDeclareRecord = taxDeclareRequest.getTaxDeclareRecord();
+
+        DeclareClient declareClient = new DeclareClient(taxDeclareRecord.getTaxAgentId());
+        return declareClient.getDeclareTaxResultFeedback(taxDeclareRecord.getRequestId());
+    }
+
+
     @Override
     public void updateDeclare(Long id) {
         TaxDeclareRequest taxDeclareRequest = buildTaxDeclareRequest(id);
diff --git a/src/com/engine/salary/web/TaxDeclarationController.java b/src/com/engine/salary/web/TaxDeclarationController.java
index c717016f5..ba563895b 100644
--- a/src/com/engine/salary/web/TaxDeclarationController.java
+++ b/src/com/engine/salary/web/TaxDeclarationController.java
@@ -202,6 +202,21 @@ public class TaxDeclarationController {
         return new ResponseResult<Long, String>(user).run(getTaxDeclareRecordWrapper(user)::getDeclareFeedback, taxDeclareRecordParam.getTaxDeclareRecordId());
     }
 
+    /**
+     * 申报内置算税结果查询
+     *
+     * @param
+     * @return
+     */
+    @GET
+    @Path("/getDeclareTaxResultFeedback")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String getDeclareTaxResultFeedback(@Context HttpServletRequest request, @Context HttpServletResponse response,  @QueryParam(value = "id") Long id) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<Long, Object>(user).run(getTaxDeclareRecordWrapper(user)::getDeclareTaxResultFeedback, id);
+    }
+
+
     /**
      * 作废
      *
diff --git a/src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java b/src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java
index 277d1d9d0..c47959f3c 100644
--- a/src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java
+++ b/src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java
@@ -461,6 +461,11 @@ public class TaxDeclareRecordWrapper extends Service {
         return taxDeclarationRate.getIndex();
     }
 
+
+    public Object getDeclareTaxResultFeedback(Long id) {
+       return getTaxDeclareRecordService(user).getDeclareTaxResultFeedback(id);
+    }
+
     /**
      * 作废
      *