From d5de8ee29bc317b3cbed23dcff76ae352649fdff Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 03 Nov 2022 15:18:56 +0800
Subject: [PATCH] 20221021

---
 src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java |  481 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 253 insertions(+), 228 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index 5d2e952..b86b8c1 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -4,6 +4,7 @@
 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 cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
@@ -59,6 +60,12 @@
     @Autowired
     private DappWalletService dappWalletService;
 
+    @Autowired
+    private ApiIgtOnHookPlanService apiIgtOnHookPlanService;
+
+    @Autowired
+    private DappOnHookDoneDao dappOnHookDoneDao;
+
     /**
      * 五分钟更新一次数据
      * 让挂机字表的状态为1:已生效
@@ -70,192 +77,203 @@
     @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){
-            BigDecimal avaAmount = igtOnHookPlanOrder.getAvaAmount();
-            if(avaAmount.compareTo(BigDecimal.ZERO) > 0){
-                /**
-                 * 获取下一个开奖记录
-                 * 生成一条开奖字表记录
-                 * 计算收益
-                 */
-                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());
-                Integer maxHours = Integer.parseInt(maxHoursDic.getValue());
-                maxHours = maxHours * 60 / 5;
-                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.multiply(new BigDecimal(igtOnHookPlanOrder.getPlanCode())).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);
+        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.multiply(new BigDecimal(igtOnHookPlanOrder.getPlanCode())).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(),
-                            DataDictionaryEnum.PLAN_A.getCode(),
-                            Integer.toString(Integer.parseInt(plan)+1));
-                    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.multiply(new BigDecimal(igtOnHookPlanOrder.getPlanCode())).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 startTime = igtOnHookPlanOrderItemsOld.get(0).getCreateTime();
-                            Date endTime = igtOnHookPlanOrderItem.getCreateTime();
-                            BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByCreateTimeAndOrderId(startTime,endTime,igtOnHookPlanOrder.getId());
-                            //如果中奖,增加挂机主表的挂机总收益,返还两次中奖之间的本金
-                            igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()
-                                    ,igtOnHookPlanOrderItem.getProfit());
-                            igtOnHookPlanOrderDao.addAvaAmountById(igtOnHookPlanOrder.getId()
-                                    ,totalAmount);
-                        }else{
-                            //如果不中奖,减少挂机剩余金额即减少本金
-                            Integer updateCount = igtOnHookPlanOrderDao.updateAvaAmountById(igtOnHookPlanOrder.getId()
-                                    ,igtOnHookPlanOrderItem.getAmount());
-                        }
-                    }
-                }
-            }
-        }
+//                        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());
+//                        }
+//                    }
+//                }
+//            }
+//        }
     }
 
 
@@ -263,56 +281,63 @@
     @Scheduled(cron = "0 0/1 * * * ? ")
     public void updatePlanOrder(){
         Log.info("开始更新挂机主表状态");
-
         List<IgtOnHookPlanOrder> igtOnHookPlanOrders = igtOnHookPlanOrderDao.selectByState(3);
-        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();
-            //总盈利
-//            BigDecimal totalProfit = igtOnHookPlanOrderItemDao.selectTotalProfitByByOrderIdAndMemberIdAndState(orderId,memberId,1,2);
-            BigDecimal totalProfit = igtOnHookPlanOrder.getProfit();
+        if(CollUtil.isNotEmpty(igtOnHookPlanOrders)){
+//            List<Long> ids = igtOnHookPlanOrderDao.selectIdsByState(3);
+//            //更新状态避免重复查询
+//            igtOnHookPlanOrderDao.updateByIds(ids);
+            for(IgtOnHookPlanOrder igtOnHookPlanOrder : igtOnHookPlanOrders){
+                Long memberId = igtOnHookPlanOrder.getMemberId();
+                BigDecimal planAmount = igtOnHookPlanOrder.getPlanAmount();
 
-            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 dappMemberEntity = dappMemberDao.selectById(memberId);
+                //避免重复
+                QueryWrapper<DappOnHookDone> objectQueryWrapper = new QueryWrapper<>();
+                objectQueryWrapper.eq("order_id",igtOnHookPlanOrder.getId());
+                List<DappOnHookDone> dappOnHookDones = dappOnHookDoneDao.selectList(objectQueryWrapper);
+                if(CollUtil.isNotEmpty(dappOnHookDones)){
+                    continue;
+                }
+                //生成记录
+                DappOnHookDone dappOnHookDone = new DappOnHookDone(dappMemberEntity.getId(), igtOnHookPlanOrder.getId());
+                dappOnHookDoneDao.insert(dappOnHookDone);
+                //获取收益率
+                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 totalProfit = planAmount.multiply(hangingRevenueLevel).setScale(4,BigDecimal.ROUND_DOWN);
 
+                String refererIds = dappMemberEntity.getRefererIds();
+                List<String> refererIdList = StrUtil.split(refererIds, ",", -1, true, true);
+                //生成流水佣金和盈利分成和流水记录,返回剩余盈利
+                BigDecimal profitSharingTotal = dappWalletService.updateLSYJYLFC(refererIdList, totalProfit,igtOnHookPlanOrder.getId());
+                //平台分成,返回剩余盈利
+                BigDecimal systemTotal = dappWalletService.updatePTFC(memberId,totalProfit,igtOnHookPlanOrder.getId());
+                totalProfit = totalProfit.subtract(profitSharingTotal).subtract(systemTotal);
 
-            //获取用户信息的是否盈利字段
-            DappMemberEntity dappMember = dappMemberDao.selectById(memberId);
-            Integer isProfit = dappMember.getIsProfit() == null ? 1 : dappMember.getIsProfit();
+                igtOnHookPlanOrder.setState(2);
+                //一次挂机剩余的全部金额
+                BigDecimal totalMoney = totalProfit.add(planAmount);
 
-            igtOnHookPlanOrder.setState(2);
-            //一次挂机剩余的全部金额
-            BigDecimal totalMoney = totalProfit.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();
+                dappWalletCoinDao.addTotalAndaddAvailableById(dappWalletCoinEntity.getId(),totalMoney);
+
+                BigDecimal add = availableAmount.add(totalMoney);
+                BigDecimal subtract = add.subtract(totalProfit);
+                DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, subtract, totalProfit, add, "投注盈利", 5,igtOnHookPlanOrder.getId());
+                dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
             }
-            igtOnHookPlanOrder.setProfit(totalProfit);
-            igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
-            dappMemberEntity.setIsOnHook(3);
-            dappMemberDao.updateById(dappMemberEntity);
-
-            DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
-            BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
-            dappWalletCoinDao.addTotalAndaddAvailableById(dappWalletCoinEntity.getId(),totalMoney);
-
-            BigDecimal add = availableAmount.add(totalMoney);
-            BigDecimal subtract = add.subtract(totalProfit);
-            DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, subtract, totalProfit, add, "投注盈利", 5);
-            dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
         }
+
     }
 
 

--
Gitblit v1.9.1