From d29f2b88ef4818fa40a91daa2f28c3f30576f502 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 30 Oct 2022 10:20:13 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java | 397 ++++++++++++++++++-----------------
src/main/resources/mapper/dapp/IgtOnHookPlanOrderItemDao.xml | 13 +
src/main/java/cc/mrbird/febs/dapp/service/ApiIgtOnHookPlanService.java | 2
src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java | 204 ++++++++++++++++++
src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderItemDao.java | 2
src/test/java/cc/mrbird/febs/JunitTest.java | 6
6 files changed, 423 insertions(+), 201 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderItemDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderItemDao.java
index 2e94e0f..6930c39 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderItemDao.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderItemDao.java
@@ -30,4 +30,6 @@
Long selectByIsgoalAndOrderId(@Param("isGoal")int i, @Param("orderId")Long orderId);
IgtOnHookPlanOrderItem selectByCreateTimeAndIsgoaAndOrderId(@Param("endTime")Date endTime, @Param("isGoal")int i, @Param("orderId")Long orderId);
+
+ IgtOnHookPlanOrderItem selectOneByIgtIdAndMemberId(@Param("orderId") Long orderId, @Param("memberId")Long memberId);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/ApiIgtOnHookPlanService.java b/src/main/java/cc/mrbird/febs/dapp/service/ApiIgtOnHookPlanService.java
index a08077b..1aca6b1 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/ApiIgtOnHookPlanService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/ApiIgtOnHookPlanService.java
@@ -24,4 +24,6 @@
BigDecimal getTotalFrofit(Long memberId);
FebsResponse awardInfo();
+
+ void updatePlanOrderItem();
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
index 30aa5db..2d1cefc 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
@@ -212,6 +212,210 @@
return new FebsResponse().success().data(apiAwardInfoVos);
}
+ @Override
+ public void 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());
+ IgtOnHookPlanOrderItem igtOnHookPlanOrderItemsOld = igtOnHookPlanOrderItemDao.selectOneByIgtIdAndMemberId(igtOnHookPlanOrder.getId(),igtOnHookPlanOrder.getMemberId());
+ //如果没有中奖记录则是新增一条1挂机方案的挂机子表记录
+ if(ObjectUtil.isEmpty(igtOnHookPlanOrderItemsOld)){
+ //获取挂机方案
+ 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 igtOnHookPlanOrderItem = new IgtOnHookPlanOrderItem();
+ igtOnHookPlanOrderItem.setMemberId(igtOnHookPlanOrder.getMemberId());
+ igtOnHookPlanOrderItem.setOrderId(igtOnHookPlanOrder.getId());
+ 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.getIsGoal()){
+ //第一条中奖记录为中奖则是新增一条1挂机方案的挂机子表记录
+ //获取挂机方案
+ 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.getOrderNum() >= maxHours){
+ igtOnHookPlanOrder.setState(3);
+ igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
+ }else{
+
+ IgtOnHookPlanOrderItem igtOnHookPlanOrderItem = new IgtOnHookPlanOrderItem();
+ igtOnHookPlanOrderItem.setMemberId(igtOnHookPlanOrder.getMemberId());
+ igtOnHookPlanOrderItem.setOrderId(igtOnHookPlanOrder.getId());
+ 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.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.getPlan();
+ //获取挂机方案
+ DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCodeAndDesc(
+ DataDictionaryEnum.PLAN_A.getType(),
+ Integer.toString(Integer.parseInt(plan)+1));
+ if(ObjectUtil.isEmpty(dataDictionaryCustom)){
+ igtOnHookPlanOrder.setState(3);
+ igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
+ }else{
+ 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.getOrderNum() >= maxHours){
+ igtOnHookPlanOrder.setState(3);
+ igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
+ }else{
+ IgtOnHookPlanOrderItem igtOnHookPlanOrderItem = new IgtOnHookPlanOrderItem();
+ igtOnHookPlanOrderItem.setMemberId(igtOnHookPlanOrder.getMemberId());
+ igtOnHookPlanOrderItem.setOrderId(igtOnHookPlanOrder.getId());
+ 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.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());
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
private String getProfitCase(String identity,BigDecimal balance){
//匹配会员等级获取对应的收益率
List<DataDictionaryCustom> dataDictionaryCustoms = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.LEVEL_MB.getType());
diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index 9f6930a..4c1ade5 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,9 @@
@Autowired
private DappWalletService dappWalletService;
+ @Autowired
+ private ApiIgtOnHookPlanService apiIgtOnHookPlanService;
+
/**
* 五分钟更新一次数据
* 让挂机字表的状态为1：已生效
@@ -70,202 +74,203 @@
@Scheduled(cron = "0 0/5 * * * ? ")
public void updatePlanOrderItem(){
Log.info("开始更新挂机子表状态");
- 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());
- }
- }
- }
- }
- }
+ 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());
+// }
+// }
+// }
+// }
+// }
}
diff --git a/src/main/resources/mapper/dapp/IgtOnHookPlanOrderItemDao.xml b/src/main/resources/mapper/dapp/IgtOnHookPlanOrderItemDao.xml
index abe78cd..48371de 100644
--- a/src/main/resources/mapper/dapp/IgtOnHookPlanOrderItemDao.xml
+++ b/src/main/resources/mapper/dapp/IgtOnHookPlanOrderItemDao.xml
@@ -72,7 +72,6 @@
and a.create_time > #{startTime}
</if>
</where>
- order by create_time desc
</select>
<select id="selectByIsgoalAndOrderId" resultType="java.lang.Long">
@@ -91,9 +90,19 @@
where a.order_id = #{orderId}
and a.is_goal = #{isGoal}
and a.create_time < #{endTime}
- order by create_time asc
+ order by a.id desc
limit 1
</select>
+ <select id="selectOneByIgtIdAndMemberId" resultType="cc.mrbird.febs.dapp.entity.IgtOnHookPlanOrderItem">
+ SELECT
+ a.*
+ FROM igt_on_hook_plan_order_item a
+ where a.order_id = #{orderId}
+ and a.member_id = #{memberId}
+ order by a.id desc
+ limit 1
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/src/test/java/cc/mrbird/febs/JunitTest.java b/src/test/java/cc/mrbird/febs/JunitTest.java
index 34c6fcf..db55a9d 100644
--- a/src/test/java/cc/mrbird/febs/JunitTest.java
+++ b/src/test/java/cc/mrbird/febs/JunitTest.java
@@ -250,15 +250,15 @@
@Test
public void testUpdateIgt(){//返还两次中奖之间的本金
- IgtOnHookPlanOrderItem igtOnHookPlanOrderItem = igtOnHookPlanOrderItemDao.selectById(3831L);
+ IgtOnHookPlanOrderItem igtOnHookPlanOrderItem = igtOnHookPlanOrderItemDao.selectById(3889L);
Date endTime = igtOnHookPlanOrderItem.getCreateTime();
Date startTime = null;
//返回上次中奖的记录
- IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(endTime,2,195L);
+ IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(endTime,2,198L);
if(ObjectUtil.isNotEmpty(igtOld)){
startTime = igtOld.getCreateTime();
}
- BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByCreateTimeAndOrderId(startTime,endTime,195L);
+ BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByCreateTimeAndOrderId(startTime,endTime,198L);
}
@Test
--
Gitblit v1.9.1