From cdc27a7a63b4ff81125ec594eb23deb22bd76e21 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 04 Nov 2022 21:57:22 +0800
Subject: [PATCH] 20221021

---
 src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java |  344 ++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 242 insertions(+), 102 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index 2952920..84c4b05 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -4,7 +4,9 @@
 import cc.mrbird.febs.dapp.entity.*;
 import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
 import cc.mrbird.febs.dapp.mapper.*;
+import cc.mrbird.febs.dapp.service.ApiIgtOnHookPlanService;
 import cc.mrbird.febs.dapp.service.DappWalletService;
+import cc.mrbird.febs.rabbit.producer.UsdtUpdateProducer;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
@@ -18,9 +20,11 @@
 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;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.Format;
@@ -58,6 +62,12 @@
     @Autowired
     private DappWalletService dappWalletService;
 
+    @Autowired
+    private ApiIgtOnHookPlanService apiIgtOnHookPlanService;
+
+    @Autowired
+    private DappOnHookDoneDao dappOnHookDoneDao;
+
     /**
      * 五分钟更新一次数据
      * 让挂机字表的状态为1:已生效
@@ -69,117 +79,237 @@
     @Scheduled(cron = "0 0/5 * * * ? ")
     public void updatePlanOrderItem(){
         Log.info("开始更新挂机子表状态");
-        List<IgtOnHookPlanOrder> igtOnHookPlanOrders = igtOnHookPlanOrderDao.selectByState(1);
-        if(CollUtil.isEmpty(igtOnHookPlanOrders)){
-            return;
-        }
-        for(IgtOnHookPlanOrder igtOnHookPlanOrder : igtOnHookPlanOrders){
-            //让挂机子表的状态为1:已生效
-            Long orderId = igtOnHookPlanOrder.getId();
-            Long memberId = igtOnHookPlanOrder.getMemberId();
-            IgtOnHookPlanOrderItem igtOnHookPlanOrderItem = igtOnHookPlanOrderItemDao.selectByOrderIdAndMemberIdAndState(orderId,memberId,2);
-            if(ObjectUtil.isNotEmpty(igtOnHookPlanOrderItem)){
-                igtOnHookPlanOrderItem.setState(1);
-                igtOnHookPlanOrderItemDao.updateById(igtOnHookPlanOrderItem);
-                if(2 == igtOnHookPlanOrderItem.getIsGoal()){
-                    //如果中奖,增加挂机主表的挂机总收益
-                    Integer updateCount = igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()
-                            ,igtOnHookPlanOrderItem.getProfit());
-                }else{
-                    //如果不中奖,减少挂机剩余金额即减少本金
-                    Integer updateCount = igtOnHookPlanOrderDao.updateAvaAmountById(igtOnHookPlanOrder.getId()
-                            ,igtOnHookPlanOrderItem.getAmount());
-                }
-            }
-
-        }
-
+        apiIgtOnHookPlanService.updatePlanOrderItem();
+//        List<IgtOnHookPlanOrder> igtOnHookPlanOrders = igtOnHookPlanOrderDao.selectByState(1);
+//        if(CollUtil.isEmpty(igtOnHookPlanOrders)){
+//            return;
+//        }
+//        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));
+//        Date awardTime = dappOnHookAward.getAwardTime();
+//        DateTime dateTime = DateUtil.offsetMinute(awardTime, 5);
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+//        String yyyyMMddHHMM = sdf.format(dateTime);
+//        DappOnHookAward dappOnHookAwardNext = dappOnHookAwardDao.selectByByAwardTime(yyyyMMddHHMM);
+//
+//        //系统挂机总次数 = 时长 * 60 / 5
+//        DataDictionaryCustom maxHoursDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.MAX_HOURS.getType(), DataDictionaryEnum.MAX_HOURS.getCode());
+//        Float maxHours = Float.parseFloat(maxHoursDic.getValue());
+//        maxHours = maxHours * 60 / 5;
+//
+//        for(IgtOnHookPlanOrder igtOnHookPlanOrder : igtOnHookPlanOrders){
+//            BigDecimal avaAmount = igtOnHookPlanOrder.getAvaAmount();
+//            if(avaAmount.compareTo(BigDecimal.ZERO) > 0){
+//                /**
+//                 * 获取下一个开奖记录
+//                 * 生成一条开奖字表记录
+//                 * 计算收益
+//                 */
+//
+//                List<IgtOnHookPlanOrderItem> igtOnHookPlanOrderItemsOld = igtOnHookPlanOrderItemDao.selectByIgtIdAndMemberId(igtOnHookPlanOrder.getId(),igtOnHookPlanOrder.getMemberId());
+//                //如果没有中奖记录则是新增一条1挂机方案的挂机子表记录
+//                if(CollUtil.isEmpty(igtOnHookPlanOrderItemsOld)){
+//
+//                    IgtOnHookPlanOrderItem igtOnHookPlanOrderItem = new IgtOnHookPlanOrderItem();
+//                    igtOnHookPlanOrderItem.setMemberId(igtOnHookPlanOrder.getMemberId());
+//                    igtOnHookPlanOrderItem.setOrderId(igtOnHookPlanOrder.getId());
+//                    //获取挂机方案
+//                    DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.PLAN_A.getType(), DataDictionaryEnum.PLAN_A.getCode());
+//                    String dataDictionaryCustomValue = dataDictionaryCustom.getValue();
+//                    JSONObject levelMemberValueParse = JSONUtil.parseObj(dataDictionaryCustomValue);
+//                    BigDecimal amountPlanA = new BigDecimal(levelMemberValueParse.get("amount").toString())
+//                            .multiply(new BigDecimal(igtOnHookPlanOrder.getPlanCode())).setScale(4,BigDecimal.ROUND_DOWN);
+//                    igtOnHookPlanOrderItem.setAmount(amountPlanA);
+//                    //获取收益率
+//                    DappMemberEntity dappMemberEntity = dappMemberDao.selectById(igtOnHookPlanOrder.getMemberId());
+//                    DataDictionaryCustom identityDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.LEVEL_MB.getType(), dappMemberEntity.getIdentity());
+//                    String identityDicValue = identityDic.getValue();
+//                    JSONObject identityDicValueParse = JSONUtil.parseObj(identityDicValue);
+//                    BigDecimal hangingRevenueLevel = new BigDecimal(identityDicValueParse.get("hangingRevenue").toString())
+//                            .multiply(new BigDecimal(0.01)).setScale(4,BigDecimal.ROUND_DOWN);
+//                    //获取收益
+//                    BigDecimal profit = amountPlanA.multiply(hangingRevenueLevel).setScale(4,BigDecimal.ROUND_DOWN);
+//                    igtOnHookPlanOrderItem.setProfit(profit.setScale(4,BigDecimal.ROUND_DOWN));
+//
+//                    igtOnHookPlanOrderItem.setState(1);
+//                    igtOnHookPlanOrderItem.setPlanCode(igtOnHookPlanOrder.getPlanCode());
+//
+//                    Integer isGoal = dappWalletService.isGoal(dappOnHookAwardNext.getAwardNum());
+//                    igtOnHookPlanOrderItem.setIsGoal(isGoal);
+//                    igtOnHookPlanOrderItem.setBelongNum(dappOnHookAwardNext.getRecordNum());
+//                    igtOnHookPlanOrderItem.setOrderNum(1);
+//                    igtOnHookPlanOrderItem.setPlan(dataDictionaryCustom.getDescription());
+//                    igtOnHookPlanOrderItemDao.insert(igtOnHookPlanOrderItem);
+//
+//                    if(2 == igtOnHookPlanOrderItem.getIsGoal()){
+//                        //如果中奖,增加挂机主表的挂机总收益
+//                        Integer updateCount = igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()
+//                                ,igtOnHookPlanOrderItem.getProfit());
+//                    }else{
+//                        //如果不中奖,减少挂机剩余金额即减少本金
+//                        Integer updateCount = igtOnHookPlanOrderDao.updateAvaAmountById(igtOnHookPlanOrder.getId()
+//                                ,igtOnHookPlanOrderItem.getAmount());
+//                    }
+//                }else if(2 == igtOnHookPlanOrderItemsOld.get(0).getIsGoal()){
+//                    //第一条中奖记录为中奖则是新增一条1挂机方案的挂机子表记录
+//                    IgtOnHookPlanOrderItem igtOnHookPlanOrderItem = new IgtOnHookPlanOrderItem();
+//                    igtOnHookPlanOrderItem.setMemberId(igtOnHookPlanOrder.getMemberId());
+//                    igtOnHookPlanOrderItem.setOrderId(igtOnHookPlanOrder.getId());
+//                    //获取挂机方案
+//                    DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.PLAN_A.getType(), DataDictionaryEnum.PLAN_A.getCode());
+//                    String dataDictionaryCustomValue = dataDictionaryCustom.getValue();
+//                    JSONObject levelMemberValueParse = JSONUtil.parseObj(dataDictionaryCustomValue);
+//                    BigDecimal amountPlanA = new BigDecimal(levelMemberValueParse.get("amount").toString())
+//                            .multiply(new BigDecimal(igtOnHookPlanOrder.getPlanCode())).setScale(4,BigDecimal.ROUND_DOWN);
+//                    //此次下注金额不足,则更新主表信息为结算中
+//                    //挂机次数超过系统规定的时间,则更新主表信息为结算中
+//                    if(avaAmount.compareTo(amountPlanA) < 0 || igtOnHookPlanOrderItemsOld.get(0).getOrderNum() >= maxHours){
+//                        igtOnHookPlanOrder.setState(3);
+//                        igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
+//                    }else{
+//                        igtOnHookPlanOrderItem.setAmount(amountPlanA);
+//                        //获取收益率
+//                        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(igtOnHookPlanOrder.getMemberId());
+//                        DataDictionaryCustom identityDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.LEVEL_MB.getType(), dappMemberEntity.getIdentity());
+//                        String identityDicValue = identityDic.getValue();
+//                        JSONObject identityDicValueParse = JSONUtil.parseObj(identityDicValue);
+//                        BigDecimal hangingRevenueLevel = new BigDecimal(identityDicValueParse.get("hangingRevenue").toString())
+//                                .multiply(new BigDecimal(0.01)).setScale(4,BigDecimal.ROUND_DOWN);
+//                        //获取收益
+//                        BigDecimal profit = amountPlanA.multiply(hangingRevenueLevel).setScale(4,BigDecimal.ROUND_DOWN);
+//                        igtOnHookPlanOrderItem.setProfit(profit.setScale(4,BigDecimal.ROUND_DOWN));
+//
+//                        igtOnHookPlanOrderItem.setState(1);
+//                        igtOnHookPlanOrderItem.setPlanCode(igtOnHookPlanOrder.getPlanCode());
+//
+//                        Integer isGoal = dappWalletService.isGoal(dappOnHookAwardNext.getAwardNum());
+//                        igtOnHookPlanOrderItem.setIsGoal(isGoal);
+//                        igtOnHookPlanOrderItem.setBelongNum(dappOnHookAwardNext.getRecordNum());
+//                        igtOnHookPlanOrderItem.setOrderNum(igtOnHookPlanOrderItemsOld.get(0).getOrderNum() + 1);
+//                        igtOnHookPlanOrderItem.setPlan(dataDictionaryCustom.getDescription());
+//                        igtOnHookPlanOrderItemDao.insert(igtOnHookPlanOrderItem);
+//
+//                        if(2 == igtOnHookPlanOrderItem.getIsGoal()){
+//
+//                            //如果中奖,增加挂机主表的挂机总收益
+//                            Integer updateCount = igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()
+//                                    ,igtOnHookPlanOrderItem.getProfit());
+//                        }else{
+//                            //如果不中奖,减少挂机剩余金额即减少本金
+//                            Integer updateCount = igtOnHookPlanOrderDao.updateAvaAmountById(igtOnHookPlanOrder.getId()
+//                                    ,igtOnHookPlanOrderItem.getAmount());
+//                        }
+//                    }
+//                }else{
+//                    //第一条没中奖则是新增一条n+1挂机方案的挂机子表记录
+//                    String plan = igtOnHookPlanOrderItemsOld.get(0).getPlan();
+//                    IgtOnHookPlanOrderItem igtOnHookPlanOrderItem = new IgtOnHookPlanOrderItem();
+//                    igtOnHookPlanOrderItem.setMemberId(igtOnHookPlanOrder.getMemberId());
+//                    igtOnHookPlanOrderItem.setOrderId(igtOnHookPlanOrder.getId());
+//                    //获取挂机方案
+//                    DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCodeAndDesc(
+//                            DataDictionaryEnum.PLAN_A.getType(),
+//                            Integer.toString(Integer.parseInt(plan)+1));
+//                    if(ObjectUtil.isEmpty(dataDictionaryCustom)){
+//                        igtOnHookPlanOrder.setState(3);
+//                        igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
+//                        return;
+//                    }
+//                    String dataDictionaryCustomValue = dataDictionaryCustom.getValue();
+//                    JSONObject levelMemberValueParse = JSONUtil.parseObj(dataDictionaryCustomValue);
+//                    BigDecimal amountPlanA = new BigDecimal(levelMemberValueParse.get("amount").toString())
+//                            .multiply(new BigDecimal(igtOnHookPlanOrder.getPlanCode())).setScale(4,BigDecimal.ROUND_DOWN);
+//                    igtOnHookPlanOrderItem.setAmount(amountPlanA);
+//                    //此次下注金额不足,则更新主表信息为结算中
+//                    if(avaAmount.compareTo(amountPlanA) < 0 || igtOnHookPlanOrderItemsOld.get(0).getOrderNum() >= maxHours){
+//                        igtOnHookPlanOrder.setState(3);
+//                        igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
+//                    }else{
+                        //获取收益率
+//                        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(igtOnHookPlanOrder.getMemberId());
+//                        DataDictionaryCustom identityDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.LEVEL_MB.getType(), dappMemberEntity.getIdentity());
+//                        String identityDicValue = identityDic.getValue();
+//                        JSONObject identityDicValueParse = JSONUtil.parseObj(identityDicValue);
+//                        BigDecimal hangingRevenueLevel = new BigDecimal(identityDicValueParse.get("hangingRevenue").toString())
+//                                .multiply(new BigDecimal(0.01)).setScale(4,BigDecimal.ROUND_DOWN);
+//                        //获取收益
+//                        BigDecimal profit = amountPlanA.multiply(hangingRevenueLevel).setScale(4,BigDecimal.ROUND_DOWN);
+//                        igtOnHookPlanOrderItem.setProfit(profit.setScale(4,BigDecimal.ROUND_DOWN));
+//
+//                        igtOnHookPlanOrderItem.setState(1);
+//                        igtOnHookPlanOrderItem.setPlanCode(igtOnHookPlanOrder.getPlanCode());
+//
+//                        Integer isGoal = dappWalletService.isGoal(dappOnHookAwardNext.getAwardNum());
+//                        igtOnHookPlanOrderItem.setIsGoal(isGoal);
+//                        igtOnHookPlanOrderItem.setBelongNum(dappOnHookAwardNext.getRecordNum());
+//                        igtOnHookPlanOrderItem.setOrderNum(igtOnHookPlanOrderItemsOld.get(0).getOrderNum() + 1);
+//                        igtOnHookPlanOrderItem.setPlan(dataDictionaryCustom.getDescription());
+//                        igtOnHookPlanOrderItemDao.insert(igtOnHookPlanOrderItem);
+//
+//                        if(2 == igtOnHookPlanOrderItem.getIsGoal()){
+//                            //返还两次中奖之间的本金
+//                            Date endTime = igtOnHookPlanOrderItem.getCreateTime();
+//                            Date startTime = null;
+//                            //返回上次中奖的记录
+//                            IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(endTime,2,igtOnHookPlanOrder.getId());
+//                            if(ObjectUtil.isNotEmpty(igtOld)){
+//                                startTime = igtOld.getCreateTime();
+//                            }
+//                            BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByCreateTimeAndOrderId(startTime,endTime,igtOnHookPlanOrderItem.getOrderId());
+//                            //如果中奖,增加挂机主表的挂机总收益,返还两次中奖之间的本金
+//                            igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()
+//                                    ,igtOnHookPlanOrderItem.getProfit());
+//                            igtOnHookPlanOrderDao.addAvaAmountById(igtOnHookPlanOrder.getId()
+//                                    ,totalAmount);
+//                        }else{
+//                            //如果不中奖,减少挂机剩余金额即减少本金
+//                            Integer updateCount = igtOnHookPlanOrderDao.updateAvaAmountById(igtOnHookPlanOrder.getId()
+//                                    ,igtOnHookPlanOrderItem.getAmount());
+//                        }
+//                    }
+//                }
+//            }
+//        }
     }
 
-    /**
-     * 根据订单主表获取订单主表中还在开始状态的订单
-     * 查询相关关联的子表
-     * 如果子表中的关联数据都已经 生效状态 1:已生效,则
-     * 1、更新主表状态为结束
-     * 2、计算总盈利
-     * 3、更新用户的余额和总额
-     * 4、生成一条资金流水记录
-     * 5、TODO
-     * 根据会员等级计算其他的流水,比如分佣金这类操作
-     */
 
+    @Resource
+    private UsdtUpdateProducer usdtUpdateProducer;
+
+    /**
+     * 挂机结束时间一到,所有挂机停止开始计算收益
+     * 根据设置的会员等级对应的(收益率*挂机本金)/(挂机时长*60分钟)=每分钟的收益
+     * 计算每个挂机的挂机时长*每分钟的收益
+     */
+    @Scheduled(cron = "0 0/1 * * * ? ")
+    public void endOnHookPlan(){
+        Log.info("挂机结束时间到了");
+        DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.END_TIME.getType(), DataDictionaryEnum.END_TIME.getCode());
+        DateTime date = DateUtil.date();
+        DateTime endTime = DateUtil.parseDate(endTimeDic.getValue());
+        if(DateUtil.compare(endTime,date)>=0){
+            //
+            igtOnHookPlanOrderDao.updatePlanOrder();
+        }
+    }
 
 //    @Scheduled(cron = "0/5 * * * * ? ")
     @Scheduled(cron = "0 0/1 * * * ? ")
     public void updatePlanOrder(){
         Log.info("开始更新挂机主表状态");
-
-        List<IgtOnHookPlanOrder> igtOnHookPlanOrders = igtOnHookPlanOrderDao.selectByState(1);
-        if(CollUtil.isEmpty(igtOnHookPlanOrders)){
-            return;
-        }
-        for(IgtOnHookPlanOrder igtOnHookPlanOrder : igtOnHookPlanOrders){
-            Long orderId = igtOnHookPlanOrder.getId();
-            Long memberId = igtOnHookPlanOrder.getMemberId();
-            BigDecimal planAmount = igtOnHookPlanOrder.getPlanAmount();
-            BigDecimal avaAmount = igtOnHookPlanOrder.getAvaAmount();
-            IgtOnHookPlanOrderItem igtOnHookPlanOrderItem = igtOnHookPlanOrderItemDao.selectByOrderIdAndMemberIdAndState(orderId,memberId,2);
-            if(ObjectUtil.isEmpty(igtOnHookPlanOrderItem)){
-                BigDecimal totalProfit = igtOnHookPlanOrderItemDao.selectTotalProfitByByOrderIdAndMemberIdAndState(orderId,memberId,1,2);
-
-                DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
-                String refererIds = dappMemberEntity.getRefererIds();
-                List<String> refererIdList = StrUtil.split(refererIds, ",", -1, true, true);
-                //生成流水佣金和盈利分成和流水记录,返回剩余盈利
-                BigDecimal profitSharingTotal = dappWalletService.updateLSYJYLFC(refererIdList, totalProfit);
-                //平台分成,返回剩余盈利
-                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 = 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{
-                    igtOnHookPlanOrder.setProfitState(1);
-                }
-                igtOnHookPlanOrder.setProfit(totalProfit);
-                igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
-                dappMemberEntity.setIsOnHook(3);
-                dappMemberDao.updateById(dappMemberEntity);
-
-                DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
-                BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
-                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);
-                BigDecimal subtract = add.subtract(totalProfit);
-                DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, subtract, totalProfit, add, "投注盈利", 5);
-                dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+        List<IgtOnHookPlanOrder> igtOnHookPlanOrders = igtOnHookPlanOrderDao.selectByState(3);
+        if(CollUtil.isNotEmpty(igtOnHookPlanOrders)){
+            for(IgtOnHookPlanOrder igtOnHookPlanOrder : igtOnHookPlanOrders){
+                usdtUpdateProducer.sendOnHookEnd(igtOnHookPlanOrder.getId());
             }
-
         }
+
     }
 
 
@@ -252,6 +382,11 @@
         }
     }
 
+
+
+    @Value("${spring.profiles.active}")
+    private String active;
+
     @Scheduled(cron = "0 0/5 * * * ? ")
     public void updateAwardInfo(){
         Log.info("更新挂架开奖记录");
@@ -262,7 +397,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);

--
Gitblit v1.9.1