From e92fd4ee90a7296fcb2336409d128dfd1bf653f4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 26 Oct 2022 15:01:06 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
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 6a2c8c1..b560fc3 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
@@ -94,7 +94,7 @@
DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.END_TIME.getType(), DataDictionaryEnum.END_TIME.getCode());
DateTime startTime = DateUtil.parseTimeToday(startTimeDic.getValue());
DateTime endTime = DateUtil.parseTimeToday(endTimeDic.getValue());
- DateTime nowTime = DateUtil.parseTimeToday(DateUtil.now());
+ DateTime nowTime = DateUtil.parseTimeToday(DateUtil.format(DateUtil.date(),"HH:mm:ss"));
if(DateUtil.compare(nowTime,startTime) < 0){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0015"));
}
@@ -231,25 +231,45 @@
BigDecimal systemTotal = dappWalletService.updatePTFC(memberId,totalProfit);
totalProfit = totalProfit.subtract(profitSharingTotal).subtract(systemTotal);
- //更新主表为结束状态
- IgtOnHookPlanOrder igtOnHookPlanOrder = igtOnHookPlanOrderDao.selectById(orderId);
- igtOnHookPlanOrder.setState(2);
- igtOnHookPlanOrder.setPlanAmount(totalProfit);
- igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
+ //获取用户信息的是否盈利字段
+ DappMemberEntity dappMember = dappMemberDao.selectById(memberId);
+ Integer isProfit = dappMember.getIsProfit() == null ? 1 : dappMember.getIsProfit();
+
//所有未中奖的本金
BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByByOrderIdAndMemberIdAndState(orderId,memberId,1,1);
+ //更新主表为结束状态
+ IgtOnHookPlanOrder igtOnHookPlanOrder = igtOnHookPlanOrderDao.selectById(orderId);
+ BigDecimal avaAmount = igtOnHookPlanOrder.getAvaAmount();
+ BigDecimal planAmount = igtOnHookPlanOrder.getPlanAmount();
+ 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);
+
DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
- //如果中奖，返回收益，如果没中奖，则返回本金,最后加上剩余总挂机金额
- BigDecimal total = totalProfit.add(totalAmount).add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN);
+ BigDecimal total = BigDecimal.ZERO;
+ if(isProfit == 2){
+ //设置成不盈利,只返回收益加剩余挂机总金额
+ total = totalProfit.add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN);
+ }else{
+ //设置成盈利，如果中奖，返回收益，如果没中奖，则返回本金,最后加上剩余总挂机金额
+// total = totalProfit.add(totalAmount).add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN);
+ total = totalProfit.add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN);
+ }
dappWalletCoinDao.addTotalAndaddAvailableById(dappWalletCoinEntity.getId(),total);
//生成流水记录
BigDecimal add = availableAmount.add(total);
- BigDecimal subtract = add.subtract(totalAmount);
+ BigDecimal subtract = add.subtract(totalProfit);
DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, subtract, totalProfit, add, "投注盈利", 5);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
//更新用户表是否正在挂机状态字段为否
- DappMemberEntity dappMember= dappMemberDao.selectById(memberId);
dappMember.setIsOnHook(3);
dappMemberDao.updateById(dappMember);
return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
@@ -330,6 +350,9 @@
}
public static void main(String[] args) {
+
+ DateTime nowTime = DateUtil.parseTimeToday(DateUtil.format(DateUtil.date(),"HH:mm:ss"));
+ System.out.println(nowTime);
int maxTimes = 10;
for(int i =1;i<maxTimes;){
maxTimes --;
--
Gitblit v1.9.1