From ec2c41a6dfbcd99b90d8df2b71f364f7d4fae96c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 15 Dec 2022 10:34:23 +0800
Subject: [PATCH] 20221213转币
---
src/main/resources/templates/febs/views/dapp/member.html | 40 ++++++++++----------
src/main/java/cc/mrbird/febs/dapp/vo/ApiRunListInfoVo.java | 4 +-
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 49 +++++++++++++-----------
src/main/resources/templates/febs/views/dapp/money-change-flow.html | 16 ++++----
4 files changed, 56 insertions(+), 53 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index ffd55d5..78eb160 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -398,29 +398,32 @@
@Override
public ApiRunListInfoVo findRunListInfo() {
ApiRunListInfoVo apiRunListInfoVo = new ApiRunListInfoVo();
-// //获取当前是第几轮队列
-// String redisKey = "QUEUE_COUNT";
-// String memberOutCount = redisUtils.getString(redisKey);
-// DataDictionaryCustom queueCountSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.QUEUE_COUNT.getType(), DataDictionaryEnum.QUEUE_COUNT.getCode());
-// String queueCount = queueCountSet.getValue();
-// if(StrUtil.isBlank(memberOutCount)){
-// redisUtils.set(redisKey,queueCount,0L);
-// memberOutCount = queueCount;
-// }
-// //出局条件的人数
-// /**
-// * 初始大小 5+4*0
-// * 1 1,2,3,4,5 1出局 5+4*0
-// * 2 2,3,4,5,1(复投),7,8,9,10 2出局 5+4*1
-// * 3 3,4,5,1(复投),7,8,9,10,2(复投),12,13,14,15 3出局 5+4*2
-// * 4 4,5,1(复投),7,8,9,10,2(复投),12,13,14,15,3(复投),17,18,19,20 4出局 5+4*3
-// */
-// Integer memberCount = Integer.parseInt(memberOutCount) * 4 + 5;
-// //判断当前是否符合出局条件
-// QueryWrapper<DappSystemProfit> objectQueryWrapper = new QueryWrapper<>();
-// objectQueryWrapper.eq("state",DappSystemProfit.STATE_IN);
-// //实际投资人数
-// Integer selectCount = dappSystemProfitDao.selectCount(objectQueryWrapper);
+ //获取当前是第几轮队列
+ String redisKey = "QUEUE_COUNT";
+ String memberOutCount = redisUtils.getString(redisKey);
+ DataDictionaryCustom queueCountSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.QUEUE_COUNT.getType(), DataDictionaryEnum.QUEUE_COUNT.getCode());
+ String queueCount = queueCountSet.getValue();
+ if(StrUtil.isBlank(memberOutCount)|| !queueCount.equals(memberOutCount)){
+ redisUtils.set(redisKey,queueCount,0L);
+ memberOutCount = queueCount;
+ }
+ //出局条件的人数
+ /**
+ * 初始大小 5+4*0
+ * 1 1,2,3,4,5 1出局 5+4*0
+ * 2 2,3,4,5,1(复投),7,8,9,10 2出局 5+4*1
+ * 3 3,4,5,1(复投),7,8,9,10,2(复投),12,13,14,15 3出局 5+4*2
+ * 4 4,5,1(复投),7,8,9,10,2(复投),12,13,14,15,3(复投),17,18,19,20 4出局 5+4*3
+ */
+ Integer memberCount = Integer.parseInt(memberOutCount) * 4 + 5;
+ //判断当前是否符合出局条件
+ QueryWrapper<DappSystemProfit> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("state",DappSystemProfit.STATE_IN);
+ //实际投资人数
+ Integer selectCount = dappSystemProfitDao.selectCount(objectQueryWrapper);
+ int runPercentNum = memberCount - selectCount;
+ runPercentNum = runPercentNum > 0 ? runPercentNum : 1;
+ apiRunListInfoVo.setRunPercent(new BigDecimal(runPercentNum).multiply(new BigDecimal(0.4)).setScale(BigDecimal.ROUND_DOWN,1));
// BigDecimal runPercent = new BigDecimal(selectCount).divide(new BigDecimal(memberCount), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100));
// apiRunListInfoVo.setRunPercent(runPercent);
//实际投资人数小于出局条件人数
diff --git a/src/main/java/cc/mrbird/febs/dapp/vo/ApiRunListInfoVo.java b/src/main/java/cc/mrbird/febs/dapp/vo/ApiRunListInfoVo.java
index 4892bac..b3a9f2d 100644
--- a/src/main/java/cc/mrbird/febs/dapp/vo/ApiRunListInfoVo.java
+++ b/src/main/java/cc/mrbird/febs/dapp/vo/ApiRunListInfoVo.java
@@ -8,8 +8,8 @@
@Data
public class ApiRunListInfoVo {
-// @ApiModelProperty(value = "动能")
-// private BigDecimal runPercent;
+ @ApiModelProperty(value = "幸运奖金")
+ private BigDecimal runPercent;
@ApiModelProperty(value = "当前幸运儿")
private Long luckyMember;
diff --git a/src/main/resources/templates/febs/views/dapp/member.html b/src/main/resources/templates/febs/views/dapp/member.html
index 48e75f2..82b1658 100644
--- a/src/main/resources/templates/febs/views/dapp/member.html
+++ b/src/main/resources/templates/febs/views/dapp/member.html
@@ -12,16 +12,16 @@
<input type="text" name="inviteId" autocomplete="off" placeholder="输入地址或邀请码" class="layui-input">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">状态</label>
- <div class="layui-input-inline">
- <select name="accountStatus">
- <option value=""></option>
- <option value="2">禁用</option>
- <option value="1">有效</option>
- </select>
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <label class="layui-form-label layui-form-label-sm">状态</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <select name="accountStatus">-->
+<!-- <option value=""></option>-->
+<!-- <option value="2">禁用</option>-->
+<!-- <option value="1">有效</option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
<!-- <div class="layui-inline">-->
<!-- <label class="layui-form-label layui-form-label-sm">可兑换</label>-->
<!-- <div class="layui-input-inline">-->
@@ -32,16 +32,16 @@
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
- <div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">可提现</label>
- <div class="layui-input-inline">
- <select name="withdrawAble">
- <option value=""></option>
- <option value="2">否</option>
- <option value="1">是</option>
- </select>
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <label class="layui-form-label layui-form-label-sm">可提现</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <select name="withdrawAble">-->
+<!-- <option value=""></option>-->
+<!-- <option value="2">否</option>-->
+<!-- <option value="1">是</option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
<div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
diff --git a/src/main/resources/templates/febs/views/dapp/money-change-flow.html b/src/main/resources/templates/febs/views/dapp/money-change-flow.html
index b467e38..feb502d 100644
--- a/src/main/resources/templates/febs/views/dapp/money-change-flow.html
+++ b/src/main/resources/templates/febs/views/dapp/money-change-flow.html
@@ -200,14 +200,14 @@
{field: 'createTime', title: '创建时间', minWidth: 150},
{title: '状态', templet: '#status-able', minWidth: 80},
{field: 'fromHash', title: 'FromHash', minWidth: 150},
- {title: '操作',
- templet: function (d) {
- if(d.status == 1){
- return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="transferManual" shiro:hasPermission="transferManual:update">手动转账</button>'
- }else{
- return ''
- }
- },minWidth: 100,align:'center'}
+ // {title: '操作',
+ // templet: function (d) {
+ // if(d.status == 1){
+ // return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="transferManual" shiro:hasPermission="transferManual:update">手动转账</button>'
+ // }else{
+ // return ''
+ // }
+ // },minWidth: 100,align:'center'}
]]
});
}
--
Gitblit v1.9.1