From e7c3f6bbcc4dd37bc931f40fb6eef475272117eb Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 29 Oct 2022 19:14:10 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/entity/IgtOnHookPlanOrderItem.java | 2
src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java | 290 +++++++++++++++++++++++--------
src/main/java/cc/mrbird/febs/dapp/service/DappWalletService.java | 5
src/main/resources/mapper/dapp/DataDictionaryCustomMapper.xml | 7
src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java | 2
src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml | 8
src/main/java/cc/mrbird/febs/dapp/mapper/DataDictionaryCustomMapper.java | 2
src/main/resources/mapper/dapp/IgtOnHookPlanOrderItemDao.xml | 28 +++
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 15 +
src/main/java/cc/mrbird/febs/dapp/entity/IgtOnHookPlanOrder.java | 2
src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java | 141 ---------------
src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderItemDao.java | 8
12 files changed, 294 insertions(+), 216 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/IgtOnHookPlanOrder.java b/src/main/java/cc/mrbird/febs/dapp/entity/IgtOnHookPlanOrder.java
index c727661..0001773 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/IgtOnHookPlanOrder.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/IgtOnHookPlanOrder.java
@@ -17,7 +17,7 @@
//挂机开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startTime;
- //挂机状态 1：开始 2：结束
+ //挂机状态 1：开始 2：结束 3:结算中
private Integer state;
public static final Integer STATE_START = 1;
public static final Integer STATE_END = 2;
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/IgtOnHookPlanOrderItem.java b/src/main/java/cc/mrbird/febs/dapp/entity/IgtOnHookPlanOrderItem.java
index f2a2bf2..fda950a 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/IgtOnHookPlanOrderItem.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/IgtOnHookPlanOrderItem.java
@@ -26,6 +26,8 @@
private Integer isGoal;
//所属期数
private String belongNum;
+ //挂机方案描述
+ private String plan;
//开奖顺序
private Integer orderNum;
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/DataDictionaryCustomMapper.java b/src/main/java/cc/mrbird/febs/dapp/mapper/DataDictionaryCustomMapper.java
index f169844..730a4fa 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/DataDictionaryCustomMapper.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/DataDictionaryCustomMapper.java
@@ -17,4 +17,6 @@
DataDictionaryCustom selectDicDataByTypeAndCode(@Param("type") String type, @Param("code") String code);
int updateDicValueByTypeAndCode(@Param("type") String type, @Param("code") String code, @Param("value") String value);
+
+ DataDictionaryCustom selectDicDataByTypeAndCodeAndDesc(@Param("type") String type, @Param("code") String code, @Param("description") String plan);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java
index ca3ef4f..6df762e 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java
@@ -16,6 +16,8 @@
Integer updateAvaAmountById(@Param("id")Long id,@Param("amount")BigDecimal amount);
+ Integer addAvaAmountById(@Param("id")Long id,@Param("amount")BigDecimal amount);
+
IgtOnHookPlanOrder selectByMemberId(@Param("memberId")Long memberId);
Integer AddProfitById(@Param("id")Long id, @Param("profit")BigDecimal balance);
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 5e2e51e..cc997b6 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderItemDao.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderItemDao.java
@@ -5,6 +5,8 @@
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
public interface IgtOnHookPlanOrderItemDao extends BaseMapper<IgtOnHookPlanOrderItem> {
@@ -20,4 +22,10 @@
BigDecimal selectTotalProfitByMemberIdAndStateAndIsgoal(@Param("memberId")Long memberId
, @Param("state")int i, @Param("isGoal")int isGoal);
+
+ List<IgtOnHookPlanOrderItem> selectByIgtIdAndMemberId(@Param("orderId") Long orderId, @Param("memberId")Long memberId);
+
+ BigDecimal selectTotalAmountByCreateTimeAndOrderId(@Param("startTime")Date startTime, @Param("endTime")Date endTime, @Param("orderId")Long id);
+
+ Long selectByIsgoalAndOrderId(@Param("isGoal")int i, @Param("orderId")Long orderId);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/DappWalletService.java b/src/main/java/cc/mrbird/febs/dapp/service/DappWalletService.java
index 00674de..f226bbd 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/DappWalletService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/DappWalletService.java
@@ -71,4 +71,9 @@
* 平台分成，返回剩余盈利
*/
BigDecimal updatePTFC(Long memberId, BigDecimal totalProfit);
+
+ /**
+ * 判断是否中奖
+ */
+ Integer isGoal(String num);
}
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 05705df..d7129e4 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
@@ -126,87 +126,6 @@
dappMember.setIsOnHook(1);
dappMemberDao.updateById(dappMember);
- List<DataDictionaryCustom> dataDictionaryCustoms = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.PLAN_A.getType());
- LinkedList<Map<String,String>> strings = new LinkedList<>();
- for(DataDictionaryCustom dataDictionaryCustom : dataDictionaryCustoms){
- Map<String, String> stringStringHashMap = new HashMap<>();
- stringStringHashMap.put(dataDictionaryCustom.getDescription(),dataDictionaryCustom.getValue());
- strings.add(stringStringHashMap);
- }
- //收益率
- BigDecimal hangingRevenue = BigDecimal.ZERO;
- //挂机时长
- DataDictionaryCustom maxHours = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.MAX_HOURS.getType(), DataDictionaryEnum.MAX_HOURS.getCode());
- if(ObjectUtil.isEmpty(maxHours)){
- throw new FebsException(MessageSourceUtils.getString("login_err_003"));
- }
- Double maxHoursValue = Double.parseDouble(maxHours.getValue());
- //获取用户信息的是否盈利字段
- Integer isProfit = dappMember.getIsProfit() == null ? 1 : dappMember.getIsProfit();
- String identity = null;
- if(isProfit == 2){
- identity = "IS_PROFIT_NO";
- }else{
- identity = "LEVEL_MB";
- DataDictionaryCustom levelMember = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.LEVEL_MB.getType(), dappMemberEntity.getIdentity());
- if(ObjectUtil.isEmpty(levelMember)){
- throw new FebsException(MessageSourceUtils.getString("login_err_003"));
- }
- String levelMemberValue = levelMember.getValue();
- JSONObject levelMemberValueParse = JSONUtil.parseObj(levelMemberValue);
- //挂机收益只有总收益的60%
- hangingRevenue = new BigDecimal(levelMemberValueParse.get("hangingRevenue").toString())
- .multiply(new BigDecimal(0.01)).setScale(4,BigDecimal.ROUND_DOWN);
- }
- //获取挂机字表的顺序
- LinkedList<String> isProfitPlan = new LinkedList<>();
- Map<String, LinkedList<String>> identity_level = MemberOnHookPlanEnum.valueOf(identity)
- .getMemberOnHook(maxHoursValue,hangingRevenue,strings);
- isProfitPlan = identity_level.get(identity);
- if(CollUtil.isEmpty(isProfitPlan)){
- throw new FebsException(MessageSourceUtils.getString("login_err_003"));
- }
- //获取下一个开奖
-
- 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));
- if(ObjectUtil.isEmpty(dappOnHookAward)){
- throw new FebsException(MessageSourceUtils.getString("login_err_003"));
- }
- Date awardTime = dappOnHookAward.getAwardTime();
- DateTime dateTime = DateUtil.offsetMinute(awardTime, 5);
- int orderNum = 1;
- for(String profitPlan : isProfitPlan){
-
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
- String yyyyMMddHHMM = sdf.format(dateTime);
- DappOnHookAward dappOnHookAwardNext = dappOnHookAwardDao.selectByByAwardTime(yyyyMMddHHMM);
-
- JSONObject jsonObject = JSONUtil.parseObj(profitPlan);
- IgtOnHookPlanOrderItem igtOnHookPlanOrderItem = new IgtOnHookPlanOrderItem();
- igtOnHookPlanOrderItem.setMemberId(memberId);
- igtOnHookPlanOrderItem.setOrderId(igtOnHookPlanOrder.getId());
- BigDecimal amount = new BigDecimal(jsonObject.get("amount").toString());
- igtOnHookPlanOrderItem.setAmount(amount.multiply(new BigDecimal(planCode)));
- BigDecimal profit = new BigDecimal(jsonObject.get("profit").toString());
- igtOnHookPlanOrderItem.setProfit(profit.multiply(new BigDecimal(planCode)));
- igtOnHookPlanOrderItem.setState(2);
- igtOnHookPlanOrderItem.setPlanCode(planCode);
- String isGoal = jsonObject.get("isGoal").toString();
- igtOnHookPlanOrderItem.setIsGoal(Integer.parseInt(isGoal));
- igtOnHookPlanOrderItem.setBelongNum(dappOnHookAwardNext.getRecordNum());
- igtOnHookPlanOrderItem.setOrderNum(orderNum);
- igtOnHookPlanOrderItemDao.insert(igtOnHookPlanOrderItem);
- orderNum++;
- dateTime = DateUtil.offsetMinute(dateTime, 5);
- }
-
DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, availableAmount, balance
, availableAmount.subtract(balance).setScale(2,BigDecimal.ROUND_DOWN), "挂机", 6);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
@@ -217,65 +136,16 @@
public FebsResponse endPlan(Long orderId) {
DappMemberEntity dappMemberEntity = LoginUserUtil.getAppUser();
Long memberId = dappMemberEntity.getId();
- /*
- 1、更新主表为结束状态
- 2、删除子表中未生效的记录
- 3、计算总收益和总挂机剩余金额，操作用户资金账户信息
- 4、生成流水记录
- 5、更新用户表是否正在挂机状态字段为否
- */
- //删除子表中未生效的记录
- QueryWrapper<IgtOnHookPlanOrderItem> objectQueryWrapper = new QueryWrapper<>();
- objectQueryWrapper.eq("order_id",orderId);
- objectQueryWrapper.eq("member_id",memberId);
- objectQueryWrapper.eq("state",2);
- igtOnHookPlanOrderItemDao.delete(objectQueryWrapper);
- //计算总收益和总挂机剩余金额，操作用户资金账户信息
- //所有中奖的收益
- BigDecimal totalProfit = igtOnHookPlanOrderItemDao.selectTotalProfitByByOrderIdAndMemberIdAndState(orderId,memberId,1,2);
- String refererIds = dappMemberDao.selectById(memberId).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 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);
+ igtOnHookPlanOrder.setState(3);
igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
- DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
- BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
- //如果中奖，返回收益,最后加上剩余总挂机金额
-// total = totalProfit.add(totalAmount).add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN);
- BigDecimal total = totalProfit.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);
//更新用户表是否正在挂机状态字段为否
+ DappMemberEntity dappMember = dappMemberDao.selectById(memberId);
dappMember.setIsOnHook(3);
dappMemberDao.updateById(dappMember);
+
return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
}
@@ -293,9 +163,8 @@
apiPlanInfoVo.setPlanAmount(igtOnHookPlanOrder.getPlanAmount());
apiPlanInfoVo.setCreateTime(igtOnHookPlanOrder.getCreateTime());
apiPlanInfoVo.setId(igtOnHookPlanOrder.getId());
- apiPlanInfoVo.setAvaAmount(igtOnHookPlanOrder.getAvaAmount());
- BigDecimal totalProfit = igtOnHookPlanOrderItemDao.selectTotalProfitByByOrderIdAndMemberIdAndState(igtOnHookPlanOrder.getId(),memberId,1,2);
- apiPlanInfoVo.setProfit(totalProfit.setScale(4,BigDecimal.ROUND_DOWN));
+ apiPlanInfoVo.setAvaAmount(igtOnHookPlanOrder.getAvaAmount().setScale(4,BigDecimal.ROUND_DOWN));
+ apiPlanInfoVo.setProfit(igtOnHookPlanOrder.getProfit().setScale(4,BigDecimal.ROUND_DOWN));
}
}
return new FebsResponse().success().data(apiPlanInfoVo);
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index 5c36ee3..550810f 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -28,6 +28,7 @@
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -1108,6 +1109,20 @@
return multiply;
}
+ @Override
+ public Integer isGoal(String num) {
+ Set set = new HashSet();
+ char[] chars = num.toCharArray();
+ for(char c:chars) {
+ set.add(c);
+ }
+ if(set.size()==num.length()){
+ return 1;
+ }else{
+ return 2;
+ }
+ }
+
private String isIdentity(List<String> refererIds,String levelCode){
String flag = levelCode;
for(String str : refererIds){
diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index c88ecba..5d2e952 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -75,39 +75,188 @@
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());
+ BigDecimal avaAmount = igtOnHookPlanOrder.getAvaAmount();
+ if(avaAmount.compareTo(BigDecimal.ZERO) > 0){
+ /**
+ * 获取下一个开奖记录
+ * 生成一条开奖字表记录
+ * 计算收益
+ */
+ String redisKey = "";
+ if("prod".equals(active)){
+ redisKey = "on_hook_award_id";
}else{
- //如果不中奖，减少挂机剩余金额即减少本金
- Integer updateCount = igtOnHookPlanOrderDao.updateAvaAmountById(igtOnHookPlanOrder.getId()
- ,igtOnHookPlanOrderItem.getAmount());
+ 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);
+ //获取收益率
+ 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());
+ }
+ }
}
}
-
}
-
}
-
- /**
- * 根据订单主表获取订单主表中还在开始状态的订单
- * 查询相关关联的子表
- * 如果子表中的关联数据都已经 生效状态 1：已生效，则
- * 1、更新主表状态为结束
- * 2、计算总盈利
- * 3、更新用户的余额和总额
- * 4、生成一条资金流水记录
- * 5、TODO
- * 根据会员等级计算其他的流水，比如分佣金这类操作
- */
// @Scheduled(cron = "0/5 * * * * ? ")
@@ -115,7 +264,7 @@
public void updatePlanOrder(){
Log.info("开始更新挂机主表状态");
- List<IgtOnHookPlanOrder> igtOnHookPlanOrders = igtOnHookPlanOrderDao.selectByState(1);
+ List<IgtOnHookPlanOrder> igtOnHookPlanOrders = igtOnHookPlanOrderDao.selectByState(3);
if(CollUtil.isEmpty(igtOnHookPlanOrders)){
return;
}
@@ -124,62 +273,45 @@
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);
+ //总盈利
+// BigDecimal totalProfit = igtOnHookPlanOrderItemDao.selectTotalProfitByByOrderIdAndMemberIdAndState(orderId,memberId,1,2);
+ BigDecimal totalProfit = igtOnHookPlanOrder.getProfit();
- 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);
+ 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);
+ //获取用户信息的是否盈利字段
+ DappMemberEntity dappMember = dappMemberDao.selectById(memberId);
+ Integer isProfit = dappMember.getIsProfit() == null ? 1 : dappMember.getIsProfit();
- 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);
+ 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);
+ dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
}
}
diff --git a/src/main/resources/mapper/dapp/DataDictionaryCustomMapper.xml b/src/main/resources/mapper/dapp/DataDictionaryCustomMapper.xml
index b1e6101..8b237c3 100644
--- a/src/main/resources/mapper/dapp/DataDictionaryCustomMapper.xml
+++ b/src/main/resources/mapper/dapp/DataDictionaryCustomMapper.xml
@@ -33,4 +33,11 @@
</if>
</where>
</update>
+
+ <select id="selectDicDataByTypeAndCodeAndDesc" resultType="cc.mrbird.febs.dapp.entity.DataDictionaryCustom">
+ select * from data_dictionary_custom a
+ where a.type=#{type}
+ and a.code=#{code}
+ and a.description=#{description}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml b/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml
index ed98061..489b31e 100644
--- a/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml
+++ b/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml
@@ -18,6 +18,14 @@
and ava_amount - #{amount} <![CDATA[ >= ]]> 0
</update>
+ <update id="addAvaAmountById">
+ update igt_on_hook_plan_order
+ set
+ ava_amount = ava_amount + #{amount},
+ where
+ id = #{id}
+ </update>
+
<select id="selectByMemberId" resultType="cc.mrbird.febs.dapp.entity.IgtOnHookPlanOrder">
SELECT
a.*
diff --git a/src/main/resources/mapper/dapp/IgtOnHookPlanOrderItemDao.xml b/src/main/resources/mapper/dapp/IgtOnHookPlanOrderItemDao.xml
index 2a57252..1064b1c 100644
--- a/src/main/resources/mapper/dapp/IgtOnHookPlanOrderItemDao.xml
+++ b/src/main/resources/mapper/dapp/IgtOnHookPlanOrderItemDao.xml
@@ -52,5 +52,33 @@
and a.state = #{state}
</select>
+ <select id="selectByIgtIdAndMemberId" 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 create_time desc
+ </select>
+
+ <select id="selectTotalAmountByCreateTimeAndOrderId" resultType="java.math.BigDecimal">
+ SELECT
+ ifnull(sum(a.amount),0)
+ FROM igt_on_hook_plan_order_item a
+ where a.order_id = #{orderId}
+ and a.create_time > #{startTime}
+ and a.create_time < #{endTime}
+ order by create_time desc
+ </select>
+
+ <select id="selectByIsgoalAndOrderId" resultType="java.lang.Long">
+ SELECT
+ a.id
+ FROM igt_on_hook_plan_order_item a
+ where a.order_id = #{orderId}
+ and a.is_goal = #{isGoal}
+ order by create_time desc
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1