20221021

xiaoyong931011

2022-10-27 ac397945cddd60cdc1c95d79c17bfca074e5687e

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

@@ -18,6 +18,7 @@
import org.apache.commons.lang3.StringUtils;
import org.jline.utils.Log;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

@@ -136,10 +137,21 @@
                BigDecimal systemTotal = dappWalletService.updatePTFC(memberId,totalProfit);
                totalProfit = totalProfit.subtract(profitSharingTotal).subtract(systemTotal);

                //获取用户信息的是否盈利字段
                DappMemberEntity dappMember = dappMemberDao.selectById(memberId);
                Integer isProfit = dappMember.getIsProfit() == null ? 1 : dappMember.getIsProfit();

                BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByByOrderIdAndMemberIdAndState(orderId,memberId,1,1);
                igtOnHookPlanOrder.setState(2);
                //一次挂机剩余的全部金额
                BigDecimal totalMoney = totalAmount.add(totalProfit).add(avaAmount);
                BigDecimal totalMoney = BigDecimal.ZERO;
                if(isProfit == 2){
                    //设置成不盈利,只返回收益加剩余挂机总金额
                    totalMoney = totalProfit.add(avaAmount);
                }else{
                    //设置成盈利，如果中奖，返回收益，如果没中奖，则返回本金,最后加上剩余总挂机金额
                    totalMoney = totalProfit.add(totalAmount).add(avaAmount);
                }
                if(totalMoney.compareTo(planAmount)<=0){
                    igtOnHookPlanOrder.setProfitState(2);
                }else{
@@ -152,9 +164,14 @@

                DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
                BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();

                //如果中奖，返回收益，如果没中奖，则返回本金,最后加上剩余总挂机金额
                BigDecimal total = totalProfit.add(totalAmount).add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN);
                BigDecimal total = BigDecimal.ZERO;
                if(isProfit == 2){
                    //设置成不盈利,只返回收益加剩余挂机总金额
                    total = totalProfit.add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN);
                }else{
                    //设置成盈利，如果中奖，返回收益，如果没中奖，则返回本金,最后加上剩余总挂机金额
                    total = totalProfit.add(totalAmount).add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN);
                }
                dappWalletCoinDao.addTotalAndaddAvailableById(dappWalletCoinEntity.getId(),total);

                BigDecimal add = availableAmount.add(total);
@@ -236,6 +253,11 @@
        }
    }



    @Value("${spring.profiles.active}")
    private String active;

    @Scheduled(cron = "0 0/5 * * * ? ")
    public void updateAwardInfo(){
        Log.info("更新挂架开奖记录");
@@ -246,7 +268,12 @@
        DappOnHookAward dappOnHookAward = dappOnHookAwardDao.selectByByAwardTime(yyyyMMddHHMM);
        dappOnHookAward.setState(1);
        dappOnHookAwardDao.updateById(dappOnHookAward);
        String redisKey = "on_hook_award_id";
        String redisKey = "";
        if("prod".equals(active)){
            redisKey = "on_hook_award_id";
        }else{
            redisKey = "on_hook_award_id_test";
        }
        String onHookAwardRedisId = redisUtils.getString(redisKey);
        if(StrUtil.isBlank(onHookAwardRedisId)){
            redisUtils.set(redisKey,dappOnHookAward.getId().toString(),0L);