angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/lx_dev' into lx_dev

This commit is contained in:
cabbage 2025-05-13 16:13:40 +08:00
parent 40c962000e db629173d2
commit 7cf899f391
2 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeServiceImpl.java
View File

@ -114,9 +114,6 @@ public class CuMemberTradeServiceImpl extends ServiceImpl<CuMemberTradeMapper, C
Integer pkAccount = cuMemberTradeVO.getPkAccount(); Integer pkAccount = cuMemberTradeVO.getPkAccount();
cuMemberTradeVO.setPkAccount(cuMemberBaseService.translateAccountValue(pkAccount)); cuMemberTradeVO.setPkAccount(cuMemberBaseService.translateAccountValue(pkAccount));
cuMemberTradeVO.setExchangeRate(exchangeRate); cuMemberTradeVO.setExchangeRate(exchangeRate);
cuMemberTradeVO.setSettleTradeAmount(settleTradeAmount);
cuMemberTradeVO.setSettleTradeBeforeBalance(settleTradeBeforeBalance);
cuMemberTradeVO.setSettleTradeBalance(settleTradeBalance);
} }
@Override @Override

27
bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTradeVO.java
View File

@ -57,13 +57,6 @@ public class CuMemberTradeVO extends CuMemberBaseVO {
@BigDecimalFormat() @BigDecimalFormat()
private BigDecimal tradeBeforeBalance; private BigDecimal tradeBeforeBalance;
/**
* 当前余额
*/
@Excel(name = "当前余额", scale = 2)
@BigDecimalFormat()
private BigDecimal tradeBalance;
/** /**
* 交易金额 * 交易金额
*/ */
@ -72,25 +65,11 @@ public class CuMemberTradeVO extends CuMemberBaseVO {
private BigDecimal tradeAmount; private BigDecimal tradeAmount;
/** /**
* 历史余额(本币) * 当前余额
*/ */
@Excel(name = "历史余额($)", scale = 2) @Excel(name = "当前余额", scale = 2)
@BigDecimalFormat() @BigDecimalFormat()
private BigDecimal settleTradeBeforeBalance; private BigDecimal tradeBalance;
/**
* 当前余额(本币)
*/
@Excel(name = "当前余额($)", scale = 2)
@BigDecimalFormat()
private BigDecimal settleTradeBalance;
/**
* 交易金额(本币)
*/
@Excel(name = "交易金额($)", scale = 2)
@BigDecimalFormat()
private BigDecimal settleTradeAmount;
/** /**
* 汇率 * 汇率