每日收益的方式改成每个周期返还收益

KKSU

2024-02-04 787c44cda3b13df37b490de2622c392c9d429501

每日收益的方式改成每个周期返还收益

 src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeNewEnum.java

@@ -11,10 +11,11 @@
@Getter
public enum MoneyFlowTypeNewEnum {

    PERK_CYCLE(27,"周期收益"),
    GSD_GFA(26,"GFD兑换GFA"),
    GSD_NFT(25,"GFD兑换NFT"),
    GSD_NFT(25,"GFD兑换卡牌"),
    GFA_GSD(24,"GFA兑换GFD"),
    NFT_GSD(23,"NFT兑换GFD"),
    NFT_GSD(23,"卡牌兑换GFD"),
    TEAM_PERK_EQUALS_DONE(22,"平级奖励"),
    TEAM_PERK_DIRECT_DONE(21,"团队奖励"),

@@ -25,17 +26,17 @@
    BASIC_PERK_DIRECT_WRONG(17,"账户冻结，遗憾错失奖励"),
    BASIC_PERK_DIRECT(16,"即将获得直推奖励"),
    SYSTEM_PEY(15,"系统拨付"),
    NFT_OUT_FEE_FCM(14,"NFT提现GFA手续费"),
    TOKEN_BUY_FROZEN_RETURN(13,"预约门票"),
    NFT_OUT_FEE_FCM(14,"卡牌提现GFA手续费"),
    TOKEN_BUY_FROZEN_RETURN(13,"预约宝石"),
    PAY(12,"支付"),
    NFT_OUT_FEE(11,"NFT提现手续费"),
    NFT_OUT(10,"NFT提现"),
    NFT_OUT_FEE(11,"卡牌提现手续费"),
    NFT_OUT(10,"提现"),
    NFT_IN(9,"GFA动态兑换"),
    FCM_OUT_FEE(8,"动态兑换手续费"),
    FCM_OUT(7,"GFA动态兑换"),
    TOKEN_BUY_FROZEN(6,"预约冻结门票"),
    TOKEN_INSIDE_IN(5,"门票转入"),
    TOKEN_INSIDE_OUT(4,"门票转出"),
    TOKEN_BUY_FROZEN(6,"预约冻结宝石"),
    TOKEN_INSIDE_IN(5,"宝石转入"),
    TOKEN_INSIDE_OUT(4,"宝石转出"),
    FCM_INSIDE_IN(3,"GFA代币转入"),
    FCM_INSIDE_OUT(2,"GFA代币转出"),
    UNFREEZE_USER(1,"解除冻结")//解除冻结

 src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java

@@ -878,19 +878,26 @@
                BigDecimal remainder = bigDecimal.remainder(new BigDecimal(String.valueOf(cycle)));//取余
                if (remainder.compareTo(BigDecimal.ZERO) == 0) {
                    /**
                     * 更新买单状态
                     * 收益生成一条卖单
                     * 本金生成一条卖单
                     * 用户的账户增加对应的收益
                     */
//                    mallProductBuy.setMateState(ProductEnum.PRODUCT_BUY_MATE_STATE_SUCCESS.getValue());
//                    mallProductBuyMapper.updateById(mallProductBuy);
                    BigDecimal nftTotal = mallProductBuy.getNftTotal();
                    BigDecimal profit = nftTotal.multiply(profitPercent.multiply(new BigDecimal(0.01)));
//                    BigDecimal add = nftTotal.add(profit);
//                    insertSell(mallProductBuy.getMemberId(),add,add,BigDecimal.ZERO,BigDecimal.ZERO);
                    BigDecimal add = nftTotal.add(profit);
                    insertSell(mallProductBuy.getMemberId(),profit,profit,BigDecimal.ZERO,BigDecimal.ZERO);
//                    insertSell(mallProductBuy.getMemberId(),profit,profit,BigDecimal.ZERO,BigDecimal.ZERO);
                    String orderNoSY = MallUtils.getOrderNum("SYNFT");
                    mallMoneyFlowService.addMoneyFlow(
                            mallProductBuy.getMemberId(),
                            profit,
                            MoneyFlowTypeNewEnum.PERK_CYCLE.getValue(),
                            orderNoSY,
                            null,
                            FlowTypeNewEnum.NFT.getValue(),
                            MoneyFlowTypeNewEnum.PERK_CYCLE.getDescrition(),
                            AppContants.MEMBER_FLOW_DONE);

                    MallMemberAmount mallMemberAmountMine = mallMemberAmountMapper.selectByMemberId(mallProductBuy.getMemberId());
                    mallMemberAmountMine.setTrendsNft(mallMemberAmountMine.getTrendsNft().add(profit));
                    mallMemberAmountMapper.updateTrendsNftById(mallMemberAmountMine);


                    /**
                     * 更新用户上级收益，冻结7天，7天时间到期自动释放到动态钱包

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java

@@ -529,7 +529,7 @@
        }
        if(2 == type){
            if (amount.compareTo(mallMemberAmountLogin.getTokenAva()) > 0) {
                throw new FebsException("门票不足");
                throw new FebsException("宝石不足");
            }
            mallMemberAmountLogin.setTokenAva(mallMemberAmountLogin.getTokenAva().subtract(amount));
            mallMemberAmountMapper.updateTokenAvaById(mallMemberAmountLogin);