fix

wzy

2022-08-27 10f588bd033e7b365eb7bc7f0396d40472e27e10

fix

 src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java

@@ -51,15 +51,6 @@
            ""),

    /**
     * 铸池币
     */
//    BSC_TFC_MAKE("BSC", "0xBae24dAa3aB94cfF8114a16A4267D769b3a651F8",
//            "0xc0cabaf5f1fce227e5f1b8a7f83a5dc28972389ffc59559d7852ce8d27c3bec4",
//            "https://bsc-dataseed1.ninicoin.io",
//            "0x46ac4921e58773ca22826df1640672b91b1db2b3",
//            ""),

    /**
     * 技术池
     */
    BSC_TFC_TECH("BSC", "0x8DB4d0E470e6cD206b774f5DAD2b5D0dD43C7688",

 src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java

@@ -70,15 +70,6 @@
        return new FebsResponse().success();
    }

//    @ApiOperation(value = "系统参数", notes = "系统参数")
//    @ApiResponses({
//            @ApiResponse(code = 200, message = "success", response = SystemDto.class)
//    })
//    @GetMapping(value = "/system")
//    public FebsResponse system() {
//        return new FebsResponse().success().data(dappSystemService.system());
//    }

    @ApiOperation(value = "我的团队", notes = "我的团队")
    @ApiResponses({
            @ApiResponse(code = 200, message = "success", response = TeamListVo.class)

 src/main/java/cc/mrbird/febs/dapp/dto/WithdrawDto.java

@@ -1,6 +1,7 @@
package cc.mrbird.febs.dapp.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
@@ -13,5 +14,9 @@
@ApiModel(value = "WithdrawDto", description = "提现")
public class WithdrawDto {

    @ApiModelProperty(value = "提现金额")
    private BigDecimal amount;

    @ApiModelProperty(value = "手续费")
    private BigDecimal fee;
}

 src/main/java/cc/mrbird/febs/dapp/service/DappWalletService.java

@@ -21,8 +21,6 @@

    void change(WalletOperateDto walletOperateDto);

    void withdraw(WalletOperateDto walletOperateDto);

    List<DappFundFlowEntity> recordInPage(RecordInPageDto recordInPageDto);

    IPage<DappFundFlowEntity> fundFlowInPage(DappFundFlowEntity dappFundFlowEntity, QueryRequest request);

 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java

@@ -112,36 +112,6 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void withdraw(WalletOperateDto walletOperateDto) {
        DappMemberEntity member = LoginUserUtil.getAppUser();

        List<DappFundFlowEntity> fundFlows = dappFundFlowDao.selectListForMemberAndDay(member.getId(), 2);
        if (CollUtil.isNotEmpty(fundFlows)) {
            throw new FebsException("一天只能提现一次");
        }

        DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
        if (walletOperateDto.getAmount().compareTo(walletCoin.getAvailableAmount()) > 0) {
            throw new FebsException("可用金额不足");
        }

        Integer fee = (Integer) redisUtils.get(AppContants.REDIS_KEY_CHANGE_FEE);

        //TODO 并发加悲观锁
        BigDecimal preAmount = walletCoin.getAvailableAmount();
        walletCoin.setAvailableAmount(walletCoin.getAvailableAmount().subtract(walletOperateDto.getAmount()));
        walletCoin.setFrozenAmount(walletCoin.getFrozenAmount().add(walletOperateDto.getAmount()));
        dappWalletCoinDao.updateById(walletCoin);

        DappFundFlowEntity fund = new DappFundFlowEntity(member.getId(), walletOperateDto.getAmount(), AppContants.MONEY_TYPE_WITHDRAWAL, 1, new BigDecimal(fee));
        dappFundFlowDao.insert(fund);

        DappAccountMoneyChangeEntity usdtChange = new DappAccountMoneyChangeEntity(member.getId(), preAmount, walletOperateDto.getAmount(), walletCoin.getAvailableAmount(), "USDT申请提现", AppContants.MONEY_TYPE_WITHDRAWAL);
        dappAccountMoneyChangeDao.insert(usdtChange);
    }

    @Override
    public List<DappFundFlowEntity> recordInPage(RecordInPageDto recordInPageDto) {
        Page<DappFundFlowEntity> page = new Page<>(recordInPageDto.getPageNum(), recordInPageDto.getPageSize());