refactor(kingdee): 优化金蝶发送逻辑并统一审计方法

- 移除冗余的 JSON 转换逻辑，直接传递 mapping 对象 - 新增 auditSend 方法支持 BaseMapping 参数类型 - 提取重复发送校验逻辑到 Sender 基类的 validMapping 方法 - 删除无用的第三方 ID 字段定义 - 统一异常处理和日志记录方式 - 优化代码结构和减少不必要的导入包 - 增强类型安全性和可维护性

refactor(kingdee): 优化金蝶发送逻辑并统一审计方法
- 移除冗余的 JSON 转换逻辑，直接传递 mapping 对象 - 新增 auditSend 方法支持 BaseMapping 参数类型 - 提取重复发送校验逻辑到 Sender 基类的 validMapping 方法 - 删除无用的第三方 ID 字段定义 - 统一异常处理和日志记录方式 - 优化代码结构和减少不必要的导入包 - 增强类型安全性和可维护性
zhangmeiyang
1 parent 39a9b760
Showing 9 changed files with 60 additions and 36 deletions
tax-central/src/main/java/com/diligrp/tax/central/domain/proxy/kingdee/ReceiptProxy.java
tax-central/src/main/java/com/diligrp/tax/central/domain/proxy/kingdee/ReceivableProxy.java
tax-central/src/main/java/com/diligrp/tax/central/domain/proxy/kingdee/RefundProxy.java
tax-proxy/src/main/java/com/diligrp/tax/proxy/demarcate/Sender.java
tax-proxy/src/main/java/com/diligrp/tax/proxy/demarcate/kingdee/CustomerSender.java
tax-proxy/src/main/java/com/diligrp/tax/proxy/demarcate/kingdee/ReceiptSender.java
tax-proxy/src/main/java/com/diligrp/tax/proxy/demarcate/kingdee/ReceivableSender.java
tax-proxy/src/main/java/com/diligrp/tax/proxy/demarcate/kingdee/RefundSender.java
tax-proxy/src/main/java/com/diligrp/tax/proxy/helper/KingDeeHelper.java
@@ -12,6 +12,5 @@ import lombok.Setter;
 @Setter
 @Getter
 public class ReceiptProxy extends BaseProxy {
-    private String thirdPartyId;
     private String thirdPartyCode;
 }
@@ -12,6 +12,5 @@ import lombok.Setter;
 @Setter
 @Getter
 public class ReceivableProxy extends BaseProxy {
-    private String thirdPartyId;
     private String thirdPartyCode;
 }
@@ -12,6 +12,5 @@ import lombok.Setter;
 @Setter
 @Getter
 public class RefundProxy extends BaseProxy {
-    private String thirdPartyId;
     private String thirdPartyCode;
 }
@@ -2,8 +2,14 @@ package com.diligrp.tax.proxy.demarcate;
 import com.diligrp.tax.central.domain.BaseMapping;
 import com.diligrp.tax.central.domain.BaseProxy;
+import com.diligrp.tax.central.exception.TaxAgentServiceException;
 import com.diligrp.tax.central.type.DocumentType;
+import com.diligrp.tax.central.type.TaxSystemType;
+import com.diligrp.tax.proxy.helper.KingDeeHelper;
 import com.kingdee.bos.webapi.entity.IdentifyInfo;
+import com.kingdee.bos.webapi.sdk.K3CloudApi;
+
+import java.util.List;
 /**
  * @Author: zhangmeiyang
@@ -26,4 +32,18 @@ public abstract class Sender&lt;T extends BaseProxy&gt; {
      * @return {@link T }
      */
     public abstract T send(BaseMapping mappingObject, IdentifyInfo identifyInfo);
+
+
+    /**
+     * @param identifyInfo 识别信息
+     * @param mapping      映射
+     */
+    protected void validMapping(IdentifyInfo identifyInfo, BaseMapping mapping) {
+        if (!mapping.getVerifyInformation().isEmpty() && !mapping.getReturnKeys().isEmpty()){
+            List<Object> infos = KingDeeHelper.querySend(mapping, markDocument().value, new K3CloudApi(identifyInfo));
+            if (!infos.isEmpty()) {
+                throw new TaxAgentServiceException(TaxSystemType.REPEAT_SENDING);
+            }
+        }
+    }
 }
@@ -41,10 +41,10 @@ public class CustomerSender extends Sender&lt;CustomerProxy&gt; {
         mapping.setFT_BD_CUSTLOCATION(handleContact(identifyInfo, mapping));
         // 联系人新增
         Optional.ofNullable(mapping.getFCUSTID()).filter(e -> !e.isEmpty()).ifPresent(e -> KingDeeHelper.unAuditSend(e, new K3CloudApi(identifyInfo), markDocument().value));
-        RepoRet<?> repoRet = KingDeeHelper.auditSend(JsonUtils.convertValue(mapping, new TypeReference<>() {}), new K3CloudApi(identifyInfo), markDocument().value);
+        RepoRet<?> repoRet = KingDeeHelper.auditSend(mapping, identifyInfo, markDocument().value);
         //联系人新增和更新完成
         ArrayList<SuccessEntity> successEntity = repoRet.getResult().getResponseStatus().getSuccessEntitys();
-        Optional.ofNullable(successEntity).filter(e -> !e.isEmpty()).orElseThrow(()->new TaxAgentServiceException(TaxSystemType.REMOTE_SERVICE_CALLS_ARE_EXCEPTIONAL));
+        Optional.ofNullable(successEntity).filter(e -> !e.isEmpty()).orElseThrow(() -> new TaxAgentServiceException(TaxSystemType.REMOTE_SERVICE_CALLS_ARE_EXCEPTIONAL));
         SuccessEntity first = successEntity.getFirst();
         var proxy = new CustomerProxy();
         proxy.setThirdPartyId(first.getId());
@@ -53,16 +53,17 @@ public class CustomerSender extends Sender&lt;CustomerProxy&gt; {
     private List<FT_BD_CUSTLOCATION> handleContact(IdentifyInfo identifyInfo, CustomerMapping mapping) {
         List<FT_BD_CUSTLOCATION> contacts = mapping.getFT_BD_CUSTLOCATION();
-        return contacts.stream().map(contact -> customerConvert(contact,identifyInfo)).toList();
+        return contacts.stream().map(contact -> customerConvert(contact, identifyInfo)).toList();
     }
-    private FT_BD_CUSTLOCATION customerConvert(FT_BD_CUSTLOCATION contact,IdentifyInfo identifyInfo) {
+    private FT_BD_CUSTLOCATION customerConvert(FT_BD_CUSTLOCATION contact, IdentifyInfo identifyInfo) {
         var customerLocation = new FT_BD_CUSTLOCATION();
         customerLocation.setFBizAddress(contact.getFBizAddress());
         customerLocation.setFCompanyType(contact.getFCompanyType());
         customerLocation.setFMOBILEPHONE(contact.getFMOBILEPHONE());
         customerLocation.setFName(contact.getFName());
-        Map<String, Object> model = JsonUtils.convertValue(customerLocation, new TypeReference<>() {});
+        Map<String, Object> model = JsonUtils.convertValue(customerLocation, new TypeReference<>() {
+        });
         RepoRet<?> repoRet = KingDeeHelper.nonAuditSend(model, new K3CloudApi(identifyInfo), "BD_CommonContact");
         SuccessEntity first = repoRet.getResult().getResponseStatus().getSuccessEntitys().getFirst();
         var res = new FT_BD_CUSTLOCATION();
@@ -36,12 +36,8 @@ public class ReceiptSender extends Sender&lt;ReceiptProxy&gt; {
     @Override
     public ReceiptProxy send(BaseMapping mappingObject, IdentifyInfo identifyInfo) {
         ReceiptMapping mapping = (ReceiptMapping) mappingObject;
-        List<Object> infos = KingDeeHelper.querySend(mapping, markDocument().value, new K3CloudApi(identifyInfo));
-        if (!infos.isEmpty()) {
-            throw new TaxAgentServiceException(TaxSystemType.REPEAT_SENDING);
-        }
-        RepoRet<?> repoRet = KingDeeHelper.auditSend(JsonUtils.convertValue(mapping, new TypeReference<>() {
-        }), new K3CloudApi(identifyInfo), markDocument().value);
+        validMapping(identifyInfo, mapping);
+        RepoRet<?> repoRet = KingDeeHelper.auditSend(mapping, identifyInfo, markDocument().value);
         ArrayList<SuccessEntity> successEntity = repoRet.getResult().getResponseStatus().getSuccessEntitys();
         if (successEntity.isEmpty()) {
             throw new TaxAgentServiceException(TaxSystemType.REMOTE_SERVICE_CALLS_ARE_EXCEPTIONAL);
@@ -6,17 +6,14 @@ import com.diligrp.tax.central.domain.proxy.kingdee.ReceivableProxy;
 import com.diligrp.tax.central.exception.TaxAgentServiceException;
 import com.diligrp.tax.central.type.DocumentType;
 import com.diligrp.tax.central.type.TaxSystemType;
-import com.diligrp.tax.central.utils.JsonUtils;
 import com.diligrp.tax.proxy.demarcate.Sender;
 import com.diligrp.tax.proxy.helper.KingDeeHelper;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.kingdee.bos.webapi.entity.IdentifyInfo;
 import com.kingdee.bos.webapi.entity.RepoRet;
 import com.kingdee.bos.webapi.entity.SuccessEntity;
-import com.kingdee.bos.webapi.sdk.K3CloudApi;
 import org.springframework.stereotype.Component;
-import java.util.*;
+import java.util.ArrayList;
 /**
  * @Author: zhangmeiyang
@@ -34,13 +31,8 @@ public class ReceivableSender extends Sender&lt;ReceivableProxy&gt; {
     @Override
     public ReceivableProxy send(BaseMapping mappingObject, IdentifyInfo identifyInfo) {
         ReceivableMapping mapping = (ReceivableMapping) mappingObject;
-        List<Object> infos = KingDeeHelper.querySend(mapping, markDocument().value, new K3CloudApi(identifyInfo));
-        if (!infos.isEmpty()) {
-            throw new TaxAgentServiceException(TaxSystemType.REPEAT_SENDING);
-        }
-        Map<String, Object> model = JsonUtils.convertValue(mapping, new TypeReference<>() {
-        });
-        RepoRet<?> repoRet = KingDeeHelper.auditSend(model, new K3CloudApi(identifyInfo), markDocument().value);
+        validMapping(identifyInfo, mapping);
+        RepoRet<?> repoRet = KingDeeHelper.auditSend(mapping, identifyInfo, markDocument().value);
         ArrayList<SuccessEntity> successEntity = repoRet.getResult().getResponseStatus().getSuccessEntitys();
         if (successEntity.isEmpty()) {
             throw new TaxAgentServiceException(TaxSystemType.REMOTE_SERVICE_CALLS_ARE_EXCEPTIONAL);
@@ -6,19 +6,14 @@ import com.diligrp.tax.central.domain.proxy.kingdee.RefundProxy;
 import com.diligrp.tax.central.exception.TaxAgentServiceException;
 import com.diligrp.tax.central.type.DocumentType;
 import com.diligrp.tax.central.type.TaxSystemType;
-import com.diligrp.tax.central.utils.JsonUtils;
 import com.diligrp.tax.proxy.demarcate.Sender;
 import com.diligrp.tax.proxy.helper.KingDeeHelper;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.kingdee.bos.webapi.entity.IdentifyInfo;
 import com.kingdee.bos.webapi.entity.RepoRet;
 import com.kingdee.bos.webapi.entity.SuccessEntity;
-import com.kingdee.bos.webapi.sdk.K3CloudApi;
 import org.springframework.stereotype.Component;
 import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
 /**
  * @Author: zhangmeiyang
@@ -36,12 +31,8 @@ public class RefundSender extends Sender&lt;RefundProxy&gt; {
     @Override
     public RefundProxy send(BaseMapping mappingObject, IdentifyInfo identifyInfo) {
         RefundMapping mapping = (RefundMapping) mappingObject;
-        List<Object> infos = KingDeeHelper.querySend(mapping, markDocument().value, new K3CloudApi(identifyInfo));
-        if (!infos.isEmpty()) {
-            throw new TaxAgentServiceException(TaxSystemType.REPEAT_SENDING);
-        }
-        RepoRet<?> repoRet = KingDeeHelper.auditSend(JsonUtils.convertValue(mapping, new TypeReference<>() {
-        }), new K3CloudApi(identifyInfo), markDocument().value);
+        validMapping(identifyInfo, mapping);
+        RepoRet<?> repoRet = KingDeeHelper.auditSend(mapping, identifyInfo, markDocument().value);
         ArrayList<SuccessEntity> successEntity = repoRet.getResult().getResponseStatus().getSuccessEntitys();
         if (successEntity.isEmpty()) {
             throw new TaxAgentServiceException(TaxSystemType.REMOTE_SERVICE_CALLS_ARE_EXCEPTIONAL);
@@ -6,6 +6,7 @@ import com.diligrp.tax.central.type.TaxSystemType;
 import com.diligrp.tax.central.utils.JsonUtils;
 import com.diligrp.tax.proxy.message.KingDeeQuery;
 import com.diligrp.tax.proxy.message.KingDeeSubmit;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.gson.Gson;
 import com.kingdee.bos.webapi.entity.*;
 import com.kingdee.bos.webapi.sdk.K3CloudApi;
@@ -74,6 +75,32 @@ public class KingDeeHelper {
         }
     }
+    /**
+     * 审计发送
+     *
+     * @param mapping      映射
+     * @param identifyInfo 识别信息
+     * @param formId       表单 ID
+     * @return {@link RepoRet }<{@link ? }>
+     */
+    public static RepoRet<?> auditSend(BaseMapping mapping, IdentifyInfo identifyInfo, String formId) {
+        var message = new KingDeeSubmit();
+        message.setModel(JsonUtils.convertValue(mapping, new TypeReference<>() {}));
+        message.setIsAutoSubmitAndAudit(true);
+        message.setIsAutoAdjustField(true);
+        var body = JsonUtils.toJsonString(message);
+        try {
+            log.info("kingdee auditSend: {}", body);
+            String res;
+            K3CloudApi api = getKingDeeApi(identifyInfo);
+            res = api.save(formId, body);
+            log.info("金蝶审核接口完成，formId={},res={}", formId, res);
+            return getRepoRet(res);
+        } catch (Exception e) {
+            log.error("金蝶审核接口调用异常", e);
+            throw new TaxAgentServiceException(TaxSystemType.REMOTE_SERVICE_CALLS_ARE_EXCEPTIONAL, e);
+        }
+    }
     /**
      * 审计发送