refactor(kingdee): 统一验证标记方法并优化映射逻辑

- 将接口 VerifyMarkInterface 中的 getVerifyMark() 方法重命名为 verify() - 更新所有实现类中的对应方法名为 verify() - 修改 BaseBill 类中货币转换器为 CurrencyConverter - 删除 CustomerMapping 中的注释掉的字段声明 - 优化 ReceiptTransformer、ReceivableTransformer 和 RefundTransformer 中的映射逻辑，使用 Optional 处理可能为空的验证键和返回键 - 在 Transformer 中调用 verify() 方法替代原来的 getVerifyMark() 方法

refactor(kingdee): 统一验证标记方法并优化映射逻辑
- 将接口 VerifyMarkInterface 中的 getVerifyMark() 方法重命名为 verify() - 更新所有实现类中的对应方法名为 verify() - 修改 BaseBill 类中货币转换器为 CurrencyConverter - 删除 CustomerMapping 中的注释掉的字段声明 - 优化 ReceiptTransformer、ReceivableTransformer 和 RefundTransformer 中的映射逻辑，使用 Optional 处理可能为空的验证键和返回键 - 在 Transformer 中调用 verify() 方法替代原来的 getVerifyMark() 方法
zhangmeiyang
1 parent d28fc887
Showing 38 changed files with 55 additions and 50 deletions
tax-central/src/main/java/com/diligrp/tax/central/domain/document/kingdee/BaseBill.java
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/CustomerMapping.java
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/VerifyMarkInterface.java
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/base/FACCOUNTID.java
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/base/FASSETID.java
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/base/FBillTypeID.java
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/base/FCONTACTUNIT.java
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/base/FCOSTDEPARTMENTID.java
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/base/FCOSTID.java
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/base/FCOUNTRY.java
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/base/FCURRENCYID.java
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/base/FCUSTOMERID.java
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/base/FChargeId.java
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/base/FContactId.java
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/base/FCreateOrgId.java
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/base/FGroup.java
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/base/FMAINBOOKSTDCURRID.java
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/base/FORDERID.java
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/base/FPAYORGID.java
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/base/FPAYUNIT.java
@@ -47,6 +47,6 @@ public abstract class BaseBill extends BaseDocument {
     /**
      * 货币(FCURRENCYID)
      */
-    @Converter(value = StringConverter.class, targetField = "FCURRENCYID")
+    @Converter(value = CurrencyConverter.class, targetField = "FCURRENCYID")
     private String currency;
 }
@@ -20,7 +20,6 @@ public class CustomerMapping extends BaseMapping {
     private FUseOrgId FUseOrgId;
     private String FShortName;
     private FCOUNTRY FCOUNTRY;
-//    private FTRADINGCURRID FTRADINGCURRID;
     private FPROVINCIAL FPROVINCIAL;
     private String FADDRESS;
     private FGroup FGroup;
@@ -2,7 +2,7 @@ package com.diligrp.tax.central.domain.mapping.kingdee;
  
 public interface VerifyMarkInterface {
  
-    String getVerifyMark();
+    String verify();
  
     String value();
 }
@@ -22,7 +22,7 @@ public class FACCOUNTID implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FACCOUNTID.FNumber";
     }
  
@@ -21,7 +21,7 @@ public class FASSETID implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FASSETID.FNUMBER";
     }
  
@@ -21,7 +21,7 @@ public class FBillTypeID implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FBillTypeID.FNUMBER";
     }
  
@@ -21,7 +21,7 @@ public class FCONTACTUNIT implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FCONTACTUNIT.FNumber";
     }
  
@@ -21,7 +21,7 @@ public class FCOSTDEPARTMENTID implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FCOSTDEPARTMENTID.FNUMBER";
     }
  
@@ -21,7 +21,7 @@ public class FCOSTID implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FCOSTID.FNUMBER";
     }
  
@@ -21,7 +21,7 @@ public class FCOUNTRY implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FCOUNTRY.FNumber";
     }
  
@@ -22,7 +22,7 @@ public class FCURRENCYID implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FCURRENCYID.FNumber";
     }
  
@@ -22,7 +22,7 @@ public class FCUSTOMERID implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FCUSTOMERID.FNumber";
     }
  
@@ -21,7 +21,7 @@ public class FChargeId implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FChargeId.FNumber";
     }
  
@@ -21,7 +21,7 @@ public class FContactId implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FContactId.FNUMBER";
     }
  
@@ -21,7 +21,7 @@ public class FCreateOrgId implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FCreateOrgId.FNumber";
     }
  
@@ -21,7 +21,7 @@ public class FGroup implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FGroup.FNumber";
     }
  
@@ -22,7 +22,7 @@ public class FMAINBOOKSTDCURRID implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FMAINBOOKSTDCURRID.FNumber";
     }
  
@@ -21,7 +21,7 @@ public class FORDERID implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FORDERID.FNumber";
     }
  
@@ -22,7 +22,7 @@ public class FPAYORGID implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FPAYORGID.FNumber";
     }
  
@@ -21,7 +21,7 @@ public class FPAYUNIT implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FPAYUNIT.FNumber";
     }
  
@@ -21,7 +21,7 @@ public class FPROVINCIAL implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FPROVINCIAL.FNumber";
     }
  
@@ -21,7 +21,7 @@ public class FPURPOSEID implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FPURPOSEID.FNumber";
     }
  
@@ -22,7 +22,7 @@ public class FRECTUNIT implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FRECTUNIT.FNumber";
     }
  
@@ -21,7 +21,7 @@ public class FSALEDEPTID implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FSALEDEPTID.FNumber";
     }
  
@@ -22,7 +22,7 @@ public class FSALEORGID implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FSALEORGID.FNumber";
     }
  
@@ -21,7 +21,7 @@ public class FSETTLECUR implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FSETTLECUR.FNUMBER";
     }
  
@@ -21,7 +21,7 @@ public class FSETTLEMAINBOOKID implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FSETTLEMAINBOOKID.FNUMBER";
     }
  
@@ -21,7 +21,7 @@ public class FSETTLEORGID implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FSETTLEORGID.FNumber";
     }
  
@@ -22,7 +22,7 @@ public class FSETTLETYPE implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FSETTLETYPEID.FNumber";
     }
  
@@ -21,7 +21,7 @@ public class FSettleTypeID implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FSettleTypeID.FNumber";
     }
  
@@ -21,7 +21,7 @@ public class FTRADINGCURRID implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FTRADINGCURRID.FNumber";
     }
  
@@ -21,7 +21,7 @@ public class FTRANSFERID implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FTRANSFERID.FNumber";
     }
  
@@ -21,7 +21,7 @@ public class FUseOrgId implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "FUseOrgId.FNumber";
     }
  
@@ -21,7 +21,7 @@ public class F_PZCW_Base_qtr implements VerifyMarkInterface {
     }
  
     @Override
-    public String getVerifyMark() {
+    public String verify() {
         return "F_PZCW_Base_qtr.FName";
     }
  
@@ -92,7 +92,7 @@ public abstract class Transformer&lt;T extends BaseMapping&gt; {
                         // 检查字段值是否为null
                         if (Objects.nonNull(fieldValue)) {
                             VerifyMarkInterface verifyObject = (VerifyMarkInterface) fieldValue;
-                            String verifyMark = verifyObject.getVerifyMark();
+                            String verifyMark = verifyObject.verify();
                             String value = verifyObject.value();
                             if (Objects.nonNull(value)) {
                                 var verify = verifyMark + "=" + value;
@@ -9,6 +9,9 @@ import com.diligrp.tax.central.utils.MappingUtils;
 import com.diligrp.tax.mapping.demarcate.Transformer;
 import org.springframework.stereotype.Component;
  
+import java.util.List;
+import java.util.Optional;
+
  
 /**
  * @Author: zhangmeiyang
@@ -27,11 +30,10 @@ public class ReceiptTransformer extends Transformer&lt;ReceiptMapping&gt; {
     public ReceiptMapping transform(BaseDocument document, TenantPipeline tenantPipeline) {
         ReceiptBill bill = (ReceiptBill) document;
         ReceiptMapping mapping = MappingUtils.convertValue(bill,ReceiptMapping.class);
-        var verifyInformation = "FBillTypeID.FNumber = 'scfyys-001' AND F_ZDB_text1 ='202510310900489' AND FALLAMOUNTFOR = '515.0' AND F_ZDB_Text667 = '正向流程' AND F_ZDB_Text5 ='666625013581'";
-        var returnKeys = "FID";
-        mapping.setVerifyInformation(verifyInformation);
-        mapping.setReturnKeys(returnKeys);
-        //TODO 组装部分参数字段
+        List<String> verifyKeys = getVerifyKeys(tenantPipeline.getId());
+        String returnKeys = getReturnKeys(tenantPipeline.getId());
+        Optional.ofNullable(verifyKeys).ifPresent(e -> mapping.setVerifyInformation(getVerifyString(verifyKeys, mapping)));
+        Optional.ofNullable(returnKeys).ifPresent(mapping::setReturnKeys);
         return mapping;
     }
 }
@@ -9,6 +9,9 @@ import com.diligrp.tax.central.utils.MappingUtils;
 import com.diligrp.tax.mapping.demarcate.Transformer;
 import org.springframework.stereotype.Component;
  
+import java.util.List;
+import java.util.Optional;
+
  
 /**
  * @Author: zhangmeiyang
@@ -27,11 +30,10 @@ public class ReceivableTransformer extends Transformer&lt;ReceivableMapping&gt; {
     public ReceivableMapping transform(BaseDocument document, TenantPipeline tenantPipeline) {
         ReceivableBill bill = (ReceivableBill) document;
         ReceivableMapping mapping = MappingUtils.convertValue(bill,ReceivableMapping.class);
-        var verifyInformation = "FBillTypeID.FNumber = 'scfyys-001' AND F_ZDB_text1 ='202510310900489' AND FALLAMOUNTFOR = '515.0' AND F_ZDB_Text667 = '正向流程' AND F_ZDB_Text5 ='666625013581'";
-        var returnKeys = "FID";
-        mapping.setVerifyInformation(verifyInformation);
-        mapping.setReturnKeys(returnKeys);
-        //TODO 组装部分参数字段
+        List<String> verifyKeys = getVerifyKeys(tenantPipeline.getId());
+        String returnKeys = getReturnKeys(tenantPipeline.getId());
+        Optional.ofNullable(verifyKeys).ifPresent(e -> mapping.setVerifyInformation(getVerifyString(verifyKeys, mapping)));
+        Optional.ofNullable(returnKeys).ifPresent(mapping::setReturnKeys);
         return mapping;
     }
 }
@@ -9,6 +9,9 @@ import com.diligrp.tax.central.utils.MappingUtils;
 import com.diligrp.tax.mapping.demarcate.Transformer;
 import org.springframework.stereotype.Component;
  
+import java.util.List;
+import java.util.Optional;
+
  
 /**
  * @Author: zhangmeiyang
@@ -27,11 +30,10 @@ public class RefundTransformer extends Transformer&lt;RefundMapping&gt; {
     public RefundMapping transform(BaseDocument document, TenantPipeline tenantPipeline) {
         RefundBill bill = (RefundBill) document;
         RefundMapping mapping = MappingUtils.convertValue(bill,RefundMapping.class);
-        var verifyInformation = "FBillTypeID.FNumber = 'scfyys-001' AND F_ZDB_text1 ='202510310900489' AND FALLAMOUNTFOR = '515.0' AND F_ZDB_Text667 = '正向流程' AND F_ZDB_Text5 ='666625013581'";
-        var returnKeys = "FID";
-        mapping.setVerifyInformation(verifyInformation);
-        mapping.setReturnKeys(returnKeys);
-        //TODO 组装部分参数字段
+        List<String> verifyKeys = getVerifyKeys(tenantPipeline.getId());
+        String returnKeys = getReturnKeys(tenantPipeline.getId());
+        Optional.ofNullable(verifyKeys).ifPresent(e -> mapping.setVerifyInformation(getVerifyString(verifyKeys, mapping)));
+        Optional.ofNullable(returnKeys).ifPresent(mapping::setReturnKeys);
         return mapping;
     }
 }