fix
Helius
2022-06-13 c7a7bc8551457ac5b6de0a383397aa9e6bb50d9b
fix
5 files modified
17 ■■■■■ changed files
src/main/java/cc/mrbird/febs/common/contants/AppContants.java 1 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java 3 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java 6 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/dapp/DappFundFlowDao.xml 2 ●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/common/contants/AppContants.java
@@ -155,6 +155,7 @@
    public static final String DIC_VALUE_SYSTEM_NODE_CNT_LIMIT = "SYSTEM_NODE_CNT_LIMIT";
    // 用户购买奖励比例(给上级)
    public static final String DIC_VALUE_USER_BUY_REWARD = "USER_BUY_REWARD";
    public static final String DIC_VALUE_MAKER_MIN_LIMIT = "MAKER_MIN_LIMIT";
    public static final String DESTROY_ADDRESS = "0x0000000000000000000000000000000000000001";
src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java
@@ -72,4 +72,9 @@
     * 滑点分享链
     */
    private String feeProfitIds;
    /**
     * 1-是 2-否
     */
    private Integer makerType;
}
src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java
@@ -139,6 +139,9 @@
                // 发送转账消息
                chainProducer.sendOnlineTransfer(JSONObject.toJSONString(map));
                fromMember.setMakerType(1);
                dappMemberService.updateById(fromMember);
            } else {
                OnlineTransferUtil.addTransfer(e.from, fundFlow.getAmount(), 1, 1, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, fundFlow.getId().toString());
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -46,6 +46,7 @@
    private final DappFundFlowDao dappFundFlowDao;
    private final DappAccountMoneyChangeDao dappAccountMoneyChangeDao;
    private final RedisUtils redisUtils;
    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
    @Override
    public WalletInfoVo walletInfo() {
@@ -240,6 +241,11 @@
                    }
                    // 如果系统还没有启动,则判断铸池中的剩余量
                } else {
                    DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_MAKER_MIN_LIMIT);
                    if (transferDto.getAmount().compareTo(new BigDecimal(dic.getValue())) < 0) {
                        throw new FebsException("未达到最低购买要求");
                    }
                    if (transferDto.getAmount().compareTo(makeCoinRemain) > 0) {
                        throw new FebsException("可购数量不足");
                    }
src/main/resources/mapper/dapp/DappFundFlowDao.xml
@@ -58,7 +58,7 @@
             , MAX(if(type = 4, a.amount, 0)) teamReward
        from (select type, sum(amount) amount
                 from dapp_fund_flow
                 where member_id=22
                 where member_id=#{memberId}
                 group by type
            ) a
    </select>