From f9ba0976b557fd0d80e3dcdb299554ab26fa969f Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Mon, 13 Jan 2025 17:34:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=87=91=E8=9E=8D?=
 =?UTF-8?q?=E8=B0=83=E5=B7=AE=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/AppDetailsVo.java                     | 24 +++++++++++++++++--
 .../ScmFinanceAdjustApplyService.java         |  8 +++++--
 .../AdjustApplyDetailsVo.java                 | 24 +++++++++++++++++--
 3 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppDetailsVo.java
index 65f5a3a5f2..d8fe46c4aa 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppDetailsVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppDetailsVo.java
@@ -51,8 +51,28 @@ public class AppDetailsVo {
     private String staffName;
     private String taskId;
     /**
-     * 合计，订单贴息金额：100，上传贴息金额：200，差额：100，已调整金额：50，当前差额：2，本次调整金额：20
+     * 差额
      */
-    private String total;
+    private String adjustmentMoneyTotal;
+    /**
+     * 已调整金额
+     */
+    private String alreadyMoneyTotal;
+    /**
+     * 订单贴息金额
+     */
+    private String estimateRebateTotal;
+    /**
+     * 本次调整金额
+     */
+    private String nowAdjustmentMoneyTotal;
+    /**
+     * 当前差额
+     */
+    private String nowDiffAmountTotal;
+    /**
+     * 上传贴息金额
+     */
+    private String uploadMoneyTotal;
 
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java
index a52bea06ab..2953378ec2 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java
@@ -1143,7 +1143,6 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
             if (!scmFileVos.isEmpty() && scmFileVos.size() > 0) {
                 List<String> files = new ArrayList<>();
                 for (ScmFileVo scmFileVo : scmFileVos) {
-                    QueryUrl url = new QueryUrl();
                     String filePath = scmFileVo.getFilePath();
                     String urlPrefix = fileUploadComponent.getUrlPrefix();
                     filePath = urlPrefix + filePath;
@@ -1179,7 +1178,12 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
                 }
                 vo.setList(list);
             }
-            vo.setTotal("订单贴息金额：" + d + "，上传贴息金额：" + s + "，差额：" + c + "，已调整金额：" + y + "，当前差额：" + d + "，本次调整金额：" + b);
+            vo.setEstimateRebateTotal(t.toString());
+            vo.setUploadMoneyTotal(s.toString());
+            vo.setAdjustmentMoneyTotal(c.toString());
+            vo.setAlreadyMoneyTotal(y.toString());
+            vo.setNowDiffAmountTotal(d.toString());
+            vo.setNowAdjustmentMoneyTotal(b.toString());
         }
         return rb.success().setData(vo);
     }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyDetailsVo.java
index b88371544f..025e5c3023 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyDetailsVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyDetailsVo.java
@@ -56,7 +56,27 @@ public class AdjustApplyDetailsVo implements Vo {
     private String staffName;
     private String taskId;
     /**
-     * 合计，订单贴息金额：100，上传贴息金额：200，差额：100，已调整金额：50，当前差额：2，本次调整金额：20
+     * 差额
      */
-    private String total;
+    private String adjustmentMoneyTotal;
+    /**
+     * 已调整金额
+     */
+    private String alreadyMoneyTotal;
+    /**
+     * 订单贴息金额
+     */
+    private String estimateRebateTotal;
+    /**
+     * 本次调整金额
+     */
+    private String nowAdjustmentMoneyTotal;
+    /**
+     * 当前差额
+     */
+    private String nowDiffAmountTotal;
+    /**
+     * 上传贴息金额
+     */
+    private String uploadMoneyTotal;
 }