Helius
2022-08-29 06fc408460ac4e4b3be9dc3e7acd60caf949819a
sde withdraw distrib change
4 files modified
3 files added
166 ■■■■■ changed files
src/main/java/cc/mrbird/febs/dapp/entity/DappSdeWithdrawFeeEntity.java 36 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/mapper/DappSdeWithdrawFeeDao.java 13 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/service/DappSystemService.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java 82 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/job/SystemTradeJob.java 9 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/dapp/DappSdeWithdrawFeeDao.xml 19 ●●●●● patch | view | raw | blame | history
src/test/java/cc/mrbird/febs/ChainTest.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/entity/DappSdeWithdrawFeeEntity.java
New file
@@ -0,0 +1,36 @@
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-08-29
 **/
@Data
@TableName("dapp_sde_withdraw_fee")
public class DappSdeWithdrawFeeEntity extends BaseEntity {
    private Long memberId;
    private String address;
    private BigDecimal amount;
    private Long sdeFlowId;
    private Integer hasReturn;
    public DappSdeWithdrawFeeEntity() {}
    public DappSdeWithdrawFeeEntity(Long memberId, String address, BigDecimal amount, Long sdeFlowId) {
        this.memberId = memberId;
        this.address = address;
        this.amount = amount;
        this.sdeFlowId = sdeFlowId;
        this.hasReturn = 2;
    }
}
src/main/java/cc/mrbird/febs/dapp/mapper/DappSdeWithdrawFeeDao.java
New file
@@ -0,0 +1,13 @@
package cc.mrbird.febs.dapp.mapper;
import cc.mrbird.febs.dapp.entity.DappSdeWithdrawFeeEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
public interface DappSdeWithdrawFeeDao extends BaseMapper<DappSdeWithdrawFeeEntity> {
    List<DappSdeWithdrawFeeEntity> selectShouldReturnList();
    int updateHasReturnToFinish();
}
src/main/java/cc/mrbird/febs/dapp/service/DappSystemService.java
@@ -58,5 +58,7 @@
    void sdmWithdrawFee(String data);
    void sdmWithdrawFeeDistrib();
    void tfcNewPrice();
}
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -61,6 +61,7 @@
    private final DappSymbolDailyPriceMapper dappSymbolDailyPriceMapper;
    private final DappMemberBoxRecordMapper dappMemberBoxRecordMapper;
    private final DappWalletCoinDao dappWalletCoinDao;
    private final DappSdeWithdrawFeeDao dappSdeWithdrawFeeDao;
    @Override
@@ -320,7 +321,7 @@
            OnlineTransferUtil.addTransfer(AppContants.DESTROY_ADDRESS, destroyAmount, fundFlow.getType(), 3, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
            BigDecimal remain = fundFlow.getFee().subtract(destroyAmount);
            BigDecimal preNftAmount = remain.divide(new BigDecimal(5000),2 ,RoundingMode.HALF_UP);
            BigDecimal preNftAmount = remain.divide(new BigDecimal(5000), 2, RoundingMode.HALF_UP);
            BigDecimal total = BigDecimal.ZERO;
            for (Map.Entry<String, Integer> entry : cardCntMap.entrySet()) {
@@ -332,7 +333,8 @@
                OnlineTransferUtil.addTransfer(entry.getKey(), profit, 4, 1, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
                total = total.add(profit);
            };
            }
            ;
            if (remain.subtract(total).compareTo(BigDecimal.ZERO) > 0) {
                OnlineTransferUtil.addTransfer(ChainEnum.BSC_TFC_FEE.getAddress(), remain.subtract(total), 4, 3, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
@@ -757,6 +759,7 @@
     * @param data
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void sdmWithdrawFee(String data) {
        JSONObject jsonObject = JSONObject.parseObject(data);
@@ -765,14 +768,13 @@
            return;
        }
        String flowId = jsonObject.getString("flow");
        BigDecimal totalFee = new BigDecimal(jsonObject.getString("fee"));
        String batchNo = RandomUtil.randomString(16);
        BigDecimal cardProfit = totalFee.multiply(new BigDecimal("0.4"));
        BigDecimal destroy = totalFee.subtract(cardProfit);
        BigDecimal preFee = cardProfit.divide(BigDecimal.valueOf(5000), ChainService.getInstance(ChainEnum.BSC_TFC.name()).decimals(), RoundingMode.HALF_UP);
        Map<String, Integer> cardCntMap = nfcCardMap();
        if (!cardCntMap.isEmpty()) {
            for (Map.Entry<String, Integer> entry : cardCntMap.entrySet()) {
@@ -782,14 +784,78 @@
                if (member == null) {
                    continue;
                }
                DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), amount, 4, 2, null, null);
                dappFundFlowDao.insert(fundFlow);
                OnlineTransferUtil.addTransfer(entry.getKey(), amount, 5, 1, ChainEnum.BSC_TFC_FEE.name(), AppContants.SYMBOL_COIN, batchNo);
                DappSdeWithdrawFeeEntity sdeWithdrawFee = new DappSdeWithdrawFeeEntity(member.getId(), member.getAddress(), amount, Long.parseLong(flowId));
                dappSdeWithdrawFeeDao.insert(sdeWithdrawFee);
            }
        }
        OnlineTransferUtil.addTransfer(AppContants.DESTROY_ADDRESS, destroy, 5, 2, ChainEnum.BSC_TFC_FEE.name(), AppContants.SYMBOL_COIN, batchNo);
        DappSdeWithdrawFeeEntity destroyFee = new DappSdeWithdrawFeeEntity(null, AppContants.DESTROY_ADDRESS, destroy, Long.parseLong(flowId));
        dappSdeWithdrawFeeDao.insert(destroyFee);
    }
//    @Override
//    public void sdmWithdrawFee(String data) {
//        JSONObject jsonObject = JSONObject.parseObject(data);
//
//        String address = jsonObject.getString("address");
//        if (!ChainEnum.BSC_TFC_FEE.getAddress().equals(address)) {
//            return;
//        }
//
//        BigDecimal totalFee = new BigDecimal(jsonObject.getString("fee"));
//        String batchNo = RandomUtil.randomString(16);
//
//        BigDecimal cardProfit = totalFee.multiply(new BigDecimal("0.4"));
//        BigDecimal destroy = totalFee.subtract(cardProfit);
//
//        BigDecimal preFee = cardProfit.divide(BigDecimal.valueOf(5000), ChainService.getInstance(ChainEnum.BSC_TFC.name()).decimals(), RoundingMode.HALF_UP);
//
//        Map<String, Integer> cardCntMap = nfcCardMap();
//        if (!cardCntMap.isEmpty()) {
//            for (Map.Entry<String, Integer> entry : cardCntMap.entrySet()) {
//                BigDecimal amount = preFee.multiply(new BigDecimal(entry.getValue()));
//
//                DappMemberEntity member = dappMemberDao.selectByAddress(entry.getKey(), "BSC");
//                if (member == null) {
//                    continue;
//                }
//                DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), amount, 4, 2, null, null);
//                dappFundFlowDao.insert(fundFlow);
//
//                OnlineTransferUtil.addTransfer(entry.getKey(), amount, 5, 1, ChainEnum.BSC_TFC_FEE.name(), AppContants.SYMBOL_COIN, batchNo);
//            }
//        }
//
//        OnlineTransferUtil.addTransfer(AppContants.DESTROY_ADDRESS, destroy, 5, 2, ChainEnum.BSC_TFC_FEE.name(), AppContants.SYMBOL_COIN, batchNo);
//
//        Map<String, Object> map = new HashMap<>();
//        map.put("batchNo", batchNo);
//        chainProducer.sendOnlineTransfer(JSONObject.toJSONString(map));
//    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void sdmWithdrawFeeDistrib() {
        List<DappSdeWithdrawFeeEntity> list = dappSdeWithdrawFeeDao.selectShouldReturnList();
        if (CollUtil.isEmpty(list)) {
            return;
        }
        String batchNo = RandomUtil.randomString(16);
        list.forEach(item -> {
            if (!AppContants.DESTROY_ADDRESS.equals(item.getAddress())) {
                DappMemberEntity member = dappMemberDao.selectByAddress(item.getAddress(), "BSC");
                if (member == null) {
                    return;
                }
                DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), item.getAmount(), 4, 2, null, null);
                dappFundFlowDao.insert(fundFlow);
            }
            OnlineTransferUtil.addTransfer(item.getAddress(), item.getAmount(), 5, 1, ChainEnum.BSC_TFC_FEE.name(), AppContants.SYMBOL_COIN, batchNo);
        });
        dappSdeWithdrawFeeDao.updateHasReturnToFinish();
        Map<String, Object> map = new HashMap<>();
        map.put("batchNo", batchNo);
src/main/java/cc/mrbird/febs/job/SystemTradeJob.java
@@ -74,4 +74,13 @@
        systemService.tfcNewPrice();
    }
    /**
     * 影子生态中,提现手续费分配
     */
    @Scheduled(cron = "0 0 0 * * ?")
    public void sdeWithdrawFeeDistribJob() {
        log.info("执行影子生态手续费分配执行");
        systemService.sdmWithdrawFeeDistrib();
    }
}
src/main/resources/mapper/dapp/DappSdeWithdrawFeeDao.xml
New file
@@ -0,0 +1,19 @@
<?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.DappSdeWithdrawFeeDao">
    <select id="selectShouldReturnList" resultType="cc.mrbird.febs.dapp.entity.DappSdeWithdrawFeeEntity">
        select
            address,
            sum(amount) amount
        from dapp_sde_withdraw_fee
        where has_return=2
    </select>
    <update id="updateHasReturnToFinish">
        update dapp_sde_withdraw_fee
            set has_return=1,
                update_time=now()
        where has_return=2
    </update>
</mapper>
src/test/java/cc/mrbird/febs/ChainTest.java
@@ -154,4 +154,9 @@
        // 发送盲盒消息
//        chainProducer.sendNftBoxMsg(179L);
    }
    @Test
    public void sendCardTest() {
        ChainService.getInstance(ChainEnum.BSC_NFT_SDC.name()).safeMintNFT("0x01B58d8DA3FCfFb409522381d3C8E09468ad788a");
    }
}