From 24e84e14c23533edc302dd8543bf8baa28079099 Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Mon, 7 Apr 2025 17:18:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E7=BA=B3=E6=AC=BE?=
 =?UTF-8?q?=E9=A1=B9=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fin/api/finpaymentrecord/FinPaymentrecord.java    |  4 ++--
 .../finpaymentrecord/FinPaymentrecordDetailsVo.java   |  4 ++--
 .../fin/api/finpaymentrecord/FinPaymentrecordDto.java |  4 ++--
 .../biz/finpaymentapply/FinPaymentapplyService.java   |  8 ++++----
 .../biz/finpaymentrecord/FinPaymentrecordService.java | 11 ++---------
 5 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java
index bb9897922c..64c373c7c2 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java
@@ -109,9 +109,9 @@ public class FinPaymentrecord extends BaseEntity {
     @ApiModelProperty("推送财务数据类型（0付款单,1凭证）")
     private Integer finDataType;
     @ApiModelProperty("应付类别分类(dictTypeCode)")
-    private String payCostType;
+    private String dictTypeCode;
     @ApiModelProperty("款项类别key(dictKey对应财务应付类别编码)")
-    private String payChannel;
+    private String dictKey;
     @ApiModelProperty("批量处理编码")
     private String batchNumber;
 }
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDetailsVo.java
index 4262d6e49c..87df0316a8 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDetailsVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDetailsVo.java
@@ -88,9 +88,9 @@ public class FinPaymentrecordDetailsVo implements Vo {
     @ApiModelProperty("推送财务数据类型（0付款单,1凭证）")
     private Integer finDataType;
     @ApiModelProperty("应付类别分类(dictTypeCode)")
-    private String payCostType;
+    private String dictTypeCode;
     @ApiModelProperty("款项类别key(dictKey对应财务应付类别编码)")
-    private String payChannel;
+    private String dictKey;
     @ApiModelProperty("批量处理编码")
     private String batchNumber;
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java
index 5dc009c5d2..d3d28fc762 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java
@@ -94,9 +94,9 @@ public class FinPaymentrecordDto implements Dto {
     @ApiModelProperty("推送财务数据类型（0付款单,1凭证）")
     private Integer finDataType;
     @ApiModelProperty("应付类别分类(dictTypeCode)")
-    private String payCostType;
+    private String dictTypeCode;
     @ApiModelProperty("款项类别key(dictKey对应财务应付类别编码)")
-    private String payChannel;
+    private String dictKey;
     @ApiModelProperty("批量处理编码")
     private String batchNumber;
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
index a5c3d2416a..442aecfbed 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
@@ -664,11 +664,11 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                         finPaymentrecordDto.setCostTypeValue(finPaymentapplyDetailVo.getCostTitleValue());
                         if ("009".equals(finPaymentapplyDetailVo.getCostTitleKey())) {
                             String paymentAccessNoKey = baseManufacturerBankFeign.selectPaymentAccessNoKey(finPaymentapply.getCarBrandSid(), finPaymentapplyDetailVo.getActualPay()).getData();
-                            finPaymentrecordDto.setPayChannel(paymentAccessNoKey);
-                            finPaymentrecordDto.setPayCostType("payChannel");
+                            finPaymentrecordDto.setDictKey(paymentAccessNoKey);
+                            finPaymentrecordDto.setDictTypeCode("payChannel");
                         } else {
-                            finPaymentrecordDto.setPayChannel(finPaymentapplyDetailVo.getCostTitleKey());
-                            finPaymentrecordDto.setPayCostType("payCostType");
+                            finPaymentrecordDto.setDictKey(finPaymentapplyDetailVo.getCostTitleKey());
+                            finPaymentrecordDto.setDictTypeCode("payCostType");
                         }
                         finPaymentrecordDto.setFinDataType(0);
                         //款项详情
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
index 15ec665d1a..dcffb53338 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
@@ -682,15 +682,8 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
 //            }
 //            apPayBill.setF_PAEZ_AssistantType("payChannel");
 //        }
-        if (StringUtils.isNotBlank(finPaymentrecord.getPayCostType())) {
-            apPayBill.setF_PAEZ_AssistantKey(finPaymentrecord.getPayCostType());
-            apPayBill.setF_PAEZ_AssistantType("payCostType");
-        }
-        if (StringUtils.isNotBlank(finPaymentrecord.getPayChannel())) {
-            apPayBill.setF_PAEZ_AssistantKey(finPaymentrecord.getPayChannel());
-            apPayBill.setF_PAEZ_AssistantType("payChannel");
-        }
-
+        apPayBill.setF_PAEZ_AssistantKey(finPaymentrecord.getDictKey());
+        apPayBill.setF_PAEZ_AssistantType(finPaymentrecord.getDictTypeCode());
         List<ApPayBill.FPAYBILLENTRY> FPAYBILLENTRYs = new ArrayList<>();
         if (finPaymentrecord.getCost() != null
                 && finPaymentrecord.getCost().compareTo(BigDecimal.ZERO) > 0) {