From db629173d2cb1566de2d9bd7141165fc86b0d2a9 Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Tue, 13 May 2025 16:03:49 +0800
Subject: [PATCH] =?UTF-8?q?feat(CumberTrade):=20=E6=B6=88=E8=B4=B9?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=B0=83=E6=95=B4=EF=BC=8C=E7=A7=BB=E9=99=A4=E6=9C=AC?=
 =?UTF-8?q?=E5=B8=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CuMemberTradeServiceImpl.java        |  3 ---
 .../member/account/vo/CuMemberTradeVO.java    | 27 +++----------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeServiceImpl.java
index 253ce481..7111b03a 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeServiceImpl.java
@@ -114,9 +114,6 @@ public class CuMemberTradeServiceImpl extends ServiceImpl<CuMemberTradeMapper, C
         Integer pkAccount = cuMemberTradeVO.getPkAccount();
         cuMemberTradeVO.setPkAccount(cuMemberBaseService.translateAccountValue(pkAccount));
         cuMemberTradeVO.setExchangeRate(exchangeRate);
-        cuMemberTradeVO.setSettleTradeAmount(settleTradeAmount);
-        cuMemberTradeVO.setSettleTradeBeforeBalance(settleTradeBeforeBalance);
-        cuMemberTradeVO.setSettleTradeBalance(settleTradeBalance);
     }
 
     @Override
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTradeVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTradeVO.java
index 9feca796..fd31460f 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTradeVO.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTradeVO.java
@@ -57,13 +57,6 @@ public class CuMemberTradeVO extends CuMemberBaseVO {
     @BigDecimalFormat()
     private BigDecimal tradeBeforeBalance;
 
-    /**
-     * 当前余额
-     */
-    @Excel(name = "当前余额", scale = 2)
-    @BigDecimalFormat()
-    private BigDecimal tradeBalance;
-
     /**
      * 交易金额
      */
@@ -72,25 +65,11 @@ public class CuMemberTradeVO extends CuMemberBaseVO {
     private BigDecimal tradeAmount;
 
     /**
-     * 历史余额(本币)
+     * 当前余额
      */
-    @Excel(name = "历史余额($)", scale = 2)
+    @Excel(name = "当前余额", scale = 2)
     @BigDecimalFormat()
-    private BigDecimal settleTradeBeforeBalance;
-
-    /**
-     * 当前余额(本币)
-     */
-    @Excel(name = "当前余额($)", scale = 2)
-    @BigDecimalFormat()
-    private BigDecimal settleTradeBalance;
-
-    /**
-     * 交易金额(本币)
-     */
-    @Excel(name = "交易金额($)", scale = 2)
-    @BigDecimalFormat()
-    private BigDecimal settleTradeAmount;
+    private BigDecimal tradeBalance;
 
     /**
      * 汇率