From d4f9d5923aac90d2ae61032475da9fa2a2d1ee1e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 22 Oct 2022 09:43:39 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java | 25 +++++++++++++++----------
1 files changed, 15 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 d8ce64d..31fbecf 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
@@ -61,6 +61,7 @@
* 定时器五分钟去更新一下详细记录的状态
*
*/
+ //todo 发送一条mq消息，根据受益方案生成挂机字表未生效详细记录(目前定时器)
DappMemberEntity dappMemberEntity = LoginUserUtil.getAppUser();
Long memberId = dappMemberEntity.getId();
DappMemberEntity member = dappMemberDao.selectById(memberId);
@@ -136,7 +137,7 @@
String levelMemberValue = levelMember.getValue();
JSONObject levelMemberValueParse = JSONUtil.parseObj(levelMemberValue);
hangingRevenue = new BigDecimal(levelMemberValueParse.get("hangingRevenue").toString())
- .multiply(new BigDecimal(0.01)).setScale(2,BigDecimal.ROUND_DOWN);
+ .multiply(new BigDecimal(0.01)).setScale(4,BigDecimal.ROUND_DOWN);
}
//获取挂机字表的顺序
LinkedList<String> isProfitPlan = new LinkedList<>();
@@ -172,7 +173,8 @@
igtOnHookPlanOrderItem.setProfit(profit.multiply(new BigDecimal(planCode)));
igtOnHookPlanOrderItem.setState(2);
igtOnHookPlanOrderItem.setPlanCode(planCode);
- igtOnHookPlanOrderItem.setIsGoal(1);
+ String isGoal = jsonObject.get("isGoal").toString();
+ igtOnHookPlanOrderItem.setIsGoal(Integer.parseInt(isGoal));
igtOnHookPlanOrderItem.setBelongNum(dappOnHookAwardNext.getRecordNum());
igtOnHookPlanOrderItem.setOrderNum(orderNum);
igtOnHookPlanOrderItemDao.insert(igtOnHookPlanOrderItem);
@@ -208,16 +210,19 @@
objectQueryWrapper.eq("state",2);
igtOnHookPlanOrderItemDao.delete(objectQueryWrapper);
//计算总收益和总挂机剩余金额，操作用户资金账户信息
+ //所有中奖的收益
BigDecimal totalProfit = igtOnHookPlanOrderItemDao.selectTotalProfitByByOrderIdAndMemberIdAndState(orderId,memberId,1,2);
- BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByByOrderIdAndMemberIdAndState(orderId,memberId,1,2);
+ //所有未中奖的本金
+ BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByByOrderIdAndMemberIdAndState(orderId,memberId,1,1);
DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
- //如果中奖，返回本金加收益加剩余总挂机金额
- BigDecimal total = totalProfit.add(totalAmount).add(igtOnHookPlanOrder.getAvaAmount()).setScale(2, BigDecimal.ROUND_DOWN);
- dappWalletCoinDao.addTotalAndaddAvailableById(memberId,total);
+ //如果中奖，返回收益，如果没中奖，则返回本金,最后加上剩余总挂机金额
+ BigDecimal total = totalProfit.add(totalAmount).add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN);
+ dappWalletCoinDao.addTotalAndaddAvailableById(dappWalletCoinEntity.getId(),total);
//生成流水记录
BigDecimal add = availableAmount.add(total);
- DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, availableAmount, total, add, "投注盈利", 5);
+ BigDecimal subtract = add.subtract(totalAmount);
+ DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, subtract, totalProfit, add, "投注盈利", 5);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
//更新用户表是否正在挂机状态字段为否
DappMemberEntity dappMember= dappMemberDao.selectById(memberId);
@@ -242,7 +247,7 @@
apiPlanInfoVo.setId(igtOnHookPlanOrder.getId());
apiPlanInfoVo.setAvaAmount(igtOnHookPlanOrder.getAvaAmount());
BigDecimal totalProfit = igtOnHookPlanOrderItemDao.selectTotalProfitByByOrderIdAndMemberIdAndState(igtOnHookPlanOrder.getId(),memberId,1,2);
- apiPlanInfoVo.setProfit(totalProfit.setScale(2,BigDecimal.ROUND_DOWN));
+ apiPlanInfoVo.setProfit(totalProfit.setScale(4,BigDecimal.ROUND_DOWN));
}
}
return new FebsResponse().success().data(apiPlanInfoVo);
@@ -261,7 +266,7 @@
ArrayList<ApiAwardInfoVo> apiAwardInfoVos = new ArrayList<>();
DateTime date = DateUtil.date();
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
String yyyyMMddHHMM = sdf.format(date);
List<DappOnHookAward> dappOnHookAwards = dappOnHookAwardDao.selectInfoByByAwardTime(yyyyMMddHHMM);
if(CollUtil.isNotEmpty(dappOnHookAwards)){
@@ -293,7 +298,7 @@
//挂机收益
BigDecimal hangingRevenue = new BigDecimal(profitValue.get("hangingRevenue").toString()).divide(new BigDecimal(100));
//预计收益
- BigDecimal expectProfit = balance.multiply(balance).setScale(2, BigDecimal.ROUND_DOWN);
+ BigDecimal expectProfit = balance.multiply(balance).setScale(4, BigDecimal.ROUND_DOWN);
}
}
--
Gitblit v1.9.1