20221021

xiaoyong931011

2022-10-26 1774094398c5c6ca376ffb677d0d86fa16c79710

20221021

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

@@ -28,6 +28,7 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.bridge.MessageUtil;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -49,6 +50,9 @@
    private final RedisUtils redisUtils;
    private final DappOnHookAwardDao dappOnHookAwardDao;
    private final DappWalletService dappWalletService;

    @Value("${spring.profiles.active}")
    private String active;
    @Override
    @Transactional(rollbackFor = Exception.class)
    public FebsResponse start(ApiStartDto apiStartDto) {
@@ -163,7 +167,13 @@
            throw new FebsException(MessageSourceUtils.getString("login_err_003"));
        }
        //获取下一个开奖
        String redisKey = "on_hook_award_id_test";

        String redisKey = "";
        if("prod".equals(active)){
            redisKey = "on_hook_award_id";
        }else{
            redisKey = "on_hook_award_id_test";
        }
        String onHookAwardRedisId = redisUtils.getString(redisKey);
        DappOnHookAward dappOnHookAward = dappOnHookAwardDao.selectById(Long.parseLong(onHookAwardRedisId));
        if(ObjectUtil.isEmpty(dappOnHookAward)){

 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;

@@ -252,6 +253,11 @@
        }
    }



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

    @Scheduled(cron = "0 0/5 * * * ? ")
    public void updateAwardInfo(){
        Log.info("更新挂架开奖记录");
@@ -262,7 +268,12 @@
        DappOnHookAward dappOnHookAward = dappOnHookAwardDao.selectByByAwardTime(yyyyMMddHHMM);
        dappOnHookAward.setState(1);
        dappOnHookAwardDao.updateById(dappOnHookAward);
        String redisKey = "on_hook_award_id_test";
        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);

 src/test/java/cc/mrbird/febs/JunitTest.java

@@ -29,6 +29,7 @@
import org.jline.utils.Log;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;

import java.math.BigDecimal;
@@ -237,6 +238,16 @@

    @Autowired
    private DappWalletService dappWalletService;


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

    @Test
    public void getActive(){
        System.out.println(active);
    }

    @Test
    public void testProfitSharing(){
        IgtOnHookPlanOrder igtOnHookPlanOrder = igtOnHookPlanOrderDao.selectById(129L);