fix ido

Helius

2022-07-13 47a171967cc902ae9a4617872f3ea9e0793d0d70

fix ido

 src/main/java/cc/mrbird/febs/dapp/entity/DappIdoAssetsEntity.java

New file
@@ -0,0 +1,24 @@
package cc.mrbird.febs.dapp.entity;

import cc.mrbird.febs.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.math.BigDecimal;

/**
 * @author wzy
 * @date 2022-07-13
 **/
@Data
@TableName("dapp_ido_assets")
public class DappIdoAssetsEntity extends BaseEntity {

    private Long memberId;

    private Integer boxCnt;

    private BigDecimal coinAmount;

    private BigDecimal usdtAmount;
}

 src/main/java/cc/mrbird/febs/dapp/mapper/DappIdoAssetsDao.java

New file
@@ -0,0 +1,10 @@
package cc.mrbird.febs.dapp.mapper;

import cc.mrbird.febs.dapp.entity.DappIdoAssetsEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

public interface DappIdoAssetsDao extends BaseMapper<DappIdoAssetsEntity> {

    DappIdoAssetsEntity selectByMemberId(@Param("memberId") Long memberId);
}

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

@@ -44,6 +44,7 @@
    private final DappMemberDao dappMemberDao;
    private final DappWalletMineDao dappWalletMineDao;
    private final DappWalletCoinDao dappWalletCoinDao;
    private final DappIdoAssetsDao dappIdoAssetsDao;
    private final DappFundFlowDao dappFundFlowDao;
    private final DappAccountMoneyChangeDao dappAccountMoneyChangeDao;
    private final RedisUtils redisUtils;
@@ -53,17 +54,11 @@
    public WalletInfoVo walletInfo() {
        DappMemberEntity member = LoginUserUtil.getAppUser();

        Map<String, BigDecimal> map = dappFundFlowDao.selectAmountTotalByType(member.getId());
        DappIdoAssetsEntity idoAssets = dappIdoAssetsDao.selectByMemberId(member.getId());
        WalletInfoVo walletInfo = new WalletInfoVo();
        List<DappMemberEntity> direct = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1);
        List<DappMemberEntity> notDirect = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 2);
        BigDecimal childHoldAmount = dappMemberDao.selectChildHoldAmount(member.getInviteId());

        walletInfo.setTotalChild(notDirect.size());
        walletInfo.setDirectCnt(direct.size());
        walletInfo.setTotalChildCoin(childHoldAmount);
        walletInfo.setTeamReward(map.get("teamReward"));
        walletInfo.setMiningAmount(map.get("mine"));
        walletInfo.setBoxCnt(idoAssets.getBoxCnt());
        walletInfo.setCoinAmount(idoAssets.getCoinAmount());
        walletInfo.setUsdtAmount(idoAssets.getUsdtAmount());
        walletInfo.setInviteId(member.getInviteId());
        return walletInfo;
    }

 src/main/java/cc/mrbird/febs/dapp/vo/WalletInfoVo.java

@@ -40,4 +40,13 @@

    @ApiModelProperty(value = "团队奖励数量")
    private BigDecimal teamReward;

    @ApiModelProperty(value = "IDO盲盒数量")
    private Integer boxCnt;

    @ApiModelProperty(value = "IDO 拥有币数量")
    private BigDecimal coinAmount;

    @ApiModelProperty(value = "IDO USDT数量")
    private BigDecimal usdtAmount;
}

 src/main/java/cc/mrbird/febs/job/GiveMeMoneyJob.java

File was deleted

 src/main/java/cc/mrbird/febs/job/MineProfitJob.java

File was deleted

 src/main/java/cc/mrbird/febs/job/SystemTradeJob.java

@@ -39,7 +39,7 @@
     * 当一个阶段的当日量72小时未100%交易完成，中转池回到上一阶段阶容量。
     * 例：当进入一个新阶段为每天出币量为3%时，此笔出量累计72小时未完全成交，源池出币量回到上一阶段每天出币2.5%，需重计5倍量，……以此类推增加或递减
     */
    @Scheduled(cron = "0 0 0 * * ?")
//    @Scheduled(cron = "0 0 0 * * ?")
    public void transferPoolVol() {
        log.info("中转池容量");
        systemService.transferPoolSetting();
@@ -50,7 +50,7 @@
     *
     * 源池每天可交易量为源池总USDT数量的10%，以上一天00:00时读取源池实时USDT数量为参考，作为当天可交易USDT数量。
     */
    @Scheduled(cron = "0 0 0 * * ?")
//    @Scheduled(cron = "0 0 0 * * ?")
    public void sourcePoolUsdtOutLimit() {
        log.info("源池每日出U限制");
        systemService.sourcePoolUsdtOutLimitSetting();
@@ -62,7 +62,7 @@
     *
     * 以中转池成交数1：1出矿（中转池卖出多少，矿池则1：1出币），每个地址所得=出币量*（单个地址持币量/全网持币量）
     */
    @Scheduled(cron = "0 0 2 * * ?")
//    @Scheduled(cron = "0 0 2 * * ?")
    public void mineJob() {
        log.info("挖矿");
        systemService.mining();

 src/main/resources/application-test.yml

@@ -18,11 +18,11 @@
          username: ct_test
          password: 123456
          driver-class-name: com.mysql.cj.jdbc.Driver
          url: jdbc:mysql://120.27.238.55:3306/db_tfc?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
          url: jdbc:mysql://120.27.238.55:3306/db_sdc?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8

  redis:
    # Redis数据库索引（默认为 0）
    database: 9
    database: 12
    # Redis服务器地址
    host: 120.27.238.55
    # Redis服务器连接端口

 src/main/resources/mapper/dapp/DappIdoAssetsDao.xml

New file
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.dapp.mapper.DappIdoAssetsDao">

    <select id="selectByMemberId" resultType="cc.mrbird.febs.dapp.entity.DappIdoAssetsEntity">
        select * from dapp_ido_assets where member_id=#{memberId}
    </select>
</mapper>