From b64e973372447a50059163016e3ce3fe56e19153 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 25 Nov 2021 16:01:24 +0800
Subject: [PATCH] Merge branch 'fish' of http://120.27.238.55:7000/r/exchange into fish
---
src/main/java/com/xcong/excoin/modules/fish/service/impl/MemberCannonServiceImpl.java | 2 +-
src/main/java/com/xcong/excoin/modules/fish/vo/AccountAvaBanlaceVo.java | 2 +-
src/main/java/com/xcong/excoin/modules/fish/dto/CoinGoldExchangeDto.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/fish/dto/CoinGoldExchangeDto.java b/src/main/java/com/xcong/excoin/modules/fish/dto/CoinGoldExchangeDto.java
index 07ab17b..3241b79 100644
--- a/src/main/java/com/xcong/excoin/modules/fish/dto/CoinGoldExchangeDto.java
+++ b/src/main/java/com/xcong/excoin/modules/fish/dto/CoinGoldExchangeDto.java
@@ -13,7 +13,7 @@
public class CoinGoldExchangeDto {
@NotNull(message = "兑换金额不能为空")
- @DecimalMin(value = "1",message = "兑换数量最小为1")
+ @DecimalMin(value = "0",message = "兑换数量必须大于0")
@ApiModelProperty(value = "兑换金额", example = "100")
private BigDecimal balance;
diff --git a/src/main/java/com/xcong/excoin/modules/fish/service/impl/MemberCannonServiceImpl.java b/src/main/java/com/xcong/excoin/modules/fish/service/impl/MemberCannonServiceImpl.java
index 44150bc..c84bd0f 100644
--- a/src/main/java/com/xcong/excoin/modules/fish/service/impl/MemberCannonServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/fish/service/impl/MemberCannonServiceImpl.java
@@ -272,7 +272,7 @@
MemberWalletCoinEntity memberWalletCoinEntityXCT = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.XCT.name());
MemberWalletCoinEntity memberWalletCoinEntityUSDT = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.USDT.name());
AccountAvaBanlaceVo accountAvaBanlaceVo = new AccountAvaBanlaceVo();
- accountAvaBanlaceVo.setMemberId(memberId);
+// accountAvaBanlaceVo.setMemberId(memberId);
accountAvaBanlaceVo.setGoldAvailableBalance(memberAccountGold.getAvailableBalance() == null?BigDecimal.ZERO:memberAccountGold.getAvailableBalance());
accountAvaBanlaceVo.setCoinAvailableBalance(memberWalletCoinEntityXCT.getAvailableBalance() == null?BigDecimal.ZERO:memberWalletCoinEntityXCT.getAvailableBalance());
accountAvaBanlaceVo.setUsdtAvailableBalance(memberWalletCoinEntityUSDT.getAvailableBalance() == null?BigDecimal.ZERO:memberWalletCoinEntityUSDT.getAvailableBalance());
diff --git a/src/main/java/com/xcong/excoin/modules/fish/vo/AccountAvaBanlaceVo.java b/src/main/java/com/xcong/excoin/modules/fish/vo/AccountAvaBanlaceVo.java
index d4d981a..f947df5 100644
--- a/src/main/java/com/xcong/excoin/modules/fish/vo/AccountAvaBanlaceVo.java
+++ b/src/main/java/com/xcong/excoin/modules/fish/vo/AccountAvaBanlaceVo.java
@@ -10,7 +10,7 @@
@ApiModel(value = "AccountAvaBanlaceVo", description = "")
public class AccountAvaBanlaceVo {
- private Long memberId;
+// private Long memberId;
@ApiModelProperty(value = "金币可用余额")
private BigDecimal goldAvailableBalance;
--
Gitblit v1.9.1