Merge branch 'fish' of http://120.27.238.55:7000/r/exchange into fish

Helius

2021-11-25 b64e973372447a50059163016e3ce3fe56e19153

Merge branch 'fish' of http://120.27.238.55:7000/r/exchange into fish

 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;


 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());

 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;