From f755301cc1bc3899bc100afdd387d7b0dc8863bf Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 25 Oct 2022 10:01:53 +0800
Subject: [PATCH] 20221021
---
src/main/resources/i18n/message_zh_CN.properties | 1
src/main/resources/i18n/message_en_US.properties | 1
src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java | 12 ++++++
src/main/resources/templates/febs/views/dapp/money-change-flow.html | 64 ++++++++++++++++++-------------
4 files changed, 51 insertions(+), 27 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 50323ae..6a2c8c1 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
@@ -89,6 +89,18 @@
if(balance.compareTo(availableAmount) > 0){
return new FebsResponse().fail().message(MessageSourceUtils.getString("balance_err_002"));
}
+ //挂机开始时间和结束时间
+ DataDictionaryCustom startTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.START_TIME.getType(), DataDictionaryEnum.START_TIME.getCode());
+ 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());
+ if(DateUtil.compare(nowTime,startTime) < 0){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0015"));
+ }
+ if(DateUtil.compare(nowTime,endTime) > 0){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0015"));
+ }
//增加一条挂机记录
IgtOnHookPlanOrder igtOnHookPlanOrder = new IgtOnHookPlanOrder();
diff --git a/src/main/resources/i18n/message_en_US.properties b/src/main/resources/i18n/message_en_US.properties
index 6442ee0..a92301a 100644
--- a/src/main/resources/i18n/message_en_US.properties
+++ b/src/main/resources/i18n/message_en_US.properties
@@ -51,6 +51,7 @@
member_err_0012=No inward transfer during hang up period
member_err_0013=Parameter cannot be empty
member_err_0014=Withdrawal once a day
+member_err_0015=Not in the hang up period
Operation_001=Operation succeeded
Operation_002=Operation failed
\ No newline at end of file
diff --git a/src/main/resources/i18n/message_zh_CN.properties b/src/main/resources/i18n/message_zh_CN.properties
index b8c4a54..fc68763 100644
--- a/src/main/resources/i18n/message_zh_CN.properties
+++ b/src/main/resources/i18n/message_zh_CN.properties
@@ -49,6 +49,7 @@
member_err_0012=\u6302\u673A\u65F6\u95F4\u6BB5\u5185\u7981\u6B62\u5185\u8F6C
member_err_0013=\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A
member_err_0014=\u6BCF\u65E5\u63D0\u73B0\u4E00\u6B21
+member_err_0015=\u4E0D\u5728\u6302\u673A\u65F6\u95F4\u6BB5\u5185
Operation_001=\u64CD\u4F5C\u6210\u529F
Operation_002=\u64CD\u4F5C\u5931\u8D25
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 ff72b1b..1716dac 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
@@ -17,33 +17,38 @@
<div class="layui-input-inline">
<select name="type">
<option value=""></option>
- <option value="1">兑换</option>
+<!-- <option value="1">兑换</option>-->
<option value="2">提现</option>
- <option value="3">采矿</option>
- <option value="4">代理返利</option>
+<!-- <option value="3">采矿</option>-->
+ <option value="4">内部转账</option>
+ <option value="5">投注盈利</option>
+ <option value="6">挂机</option>
+ <option value="7">流水佣金</option>
+ <option value="8">盈利分成</option>
+ <option value="9">系统</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="changeAble">
- <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 class="layui-inline">-->
+<!-- <label class="layui-form-label layui-form-label-sm">可兑换</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <select name="changeAble">-->
+<!-- <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">
@@ -70,10 +75,15 @@
<script type="text/html" id="type-format">
{{#
var type = {
- 1: {title: '兑换'},
+<!-- 1: {title: '兑换'},-->
2: {title: '提现'},
- 3: {title: '采矿'},
- 4: {title: '代理返利'}
+<!-- 3: {title: '采矿'},-->
+ 4: {title: '内部转账'},
+ 5: {title: '投注盈利'},
+ 6: {title: '挂机'},
+ 7: {title: '流水佣金'},
+ 8: {title: '盈利分成'},
+ 9: {title: '系统'},
}[d.type];
}}
<span>{{ type.title }}</span>
@@ -129,7 +139,7 @@
id: 'moneyChangeTable',
url: ctx + 'flow/accountMoneyChangeFlow',
cols: [[
- {field: 'address', title: '地址', minWidth: 150},
+ // {field: 'address', title: '地址', minWidth: 150},
{field: 'username', title: '用户名', minWidth: 150},
{field: 'preAmount', title: '变化前金额', minWidth: 100},
{field: 'amount', title: '变化金额', minWidth: 100},
--
Gitblit v1.9.1