From 2464548977f4720bc8fceeb5d999c1a3852c2d10 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 21 四月 2022 19:38:30 +0800
Subject: [PATCH] 签到与任务
---
app/src/main/java/com/yeshi/makemoney/app/service/impl/money/ExtractServiceImpl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/yeshi/makemoney/app/service/impl/money/ExtractServiceImpl.java b/app/src/main/java/com/yeshi/makemoney/app/service/impl/money/ExtractServiceImpl.java
index ba60441..24e239b 100644
--- a/app/src/main/java/com/yeshi/makemoney/app/service/impl/money/ExtractServiceImpl.java
+++ b/app/src/main/java/com/yeshi/makemoney/app/service/impl/money/ExtractServiceImpl.java
@@ -101,7 +101,8 @@
return extractMapper.count(daoQuery) < 1L;
}
- private ExtractConfig getExtractConfig(SystemEnum system) {
+ @Override
+ public ExtractConfig getExtractConfig(SystemEnum system) {
String value = systemConfigService.getValueCache(system, SystemConfigKey.extractConfig);
if (StringUtil.isNullOrEmpty(value)) {
return null;
@@ -146,7 +147,7 @@
}
//灏忛噾棰濇彁鐜伴檺鍒�
- if (money.compareTo(new BigDecimal(1)) < 0) {
+ if (money.compareTo(Constant.EXTRACT_LITTLE_MONEY_LIMIT) < 0) {
//鏄惁宸茬粡鐢ㄥ畬鏂扮敤鎴烽搴�
if (!canExtractLittleMoney(user.getId(), config.getNewerLittleMoneyNum(), new Date(currentTime))) {
throw new ExtractException(ExtractException.CODE_LITTLE_MONEY_LIMIT, "浠婃棩灏忎簬1鍏冩彁鐜版鏁板凡鐢ㄥ敖");
@@ -158,7 +159,7 @@
@Override
public boolean canExtractLittleMoney(Long uid, int maxNewerCount, Date date) {
//鍒ゆ柇鏂颁汉
- long count = countByMaxMoney(uid, new BigDecimal(1), Arrays.asList(new Integer[]{Extract.STATE_NOT_PROCESS, Extract.STATE_PROCESSING, Extract.STATE_PASS}), null);
+ long count = countByMaxMoney(uid,Constant.EXTRACT_LITTLE_MONEY_LIMIT, Arrays.asList(new Integer[]{Extract.STATE_NOT_PROCESS, Extract.STATE_PROCESSING, Extract.STATE_PASS}), null);
if (maxNewerCount > count) {
return true;
}
@@ -168,13 +169,23 @@
if (limit <= 0) {
return false;
}
- count = countByMaxMoney(uid, new BigDecimal(1), Arrays.asList(new Integer[]{Extract.STATE_NOT_PROCESS, Extract.STATE_PROCESSING, Extract.STATE_PASS}), new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(date.getTime(), "yyyyMMdd"), "yyyyMMdd")));
+ count = countByMaxMoney(uid, Constant.EXTRACT_LITTLE_MONEY_LIMIT, Arrays.asList(new Integer[]{Extract.STATE_NOT_PROCESS, Extract.STATE_PROCESSING, Extract.STATE_PASS}), new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(date.getTime(), "yyyyMMdd"), "yyyyMMdd")));
if (count < limit) {
return true;
}
return false;
}
+ @Override
+ public BigDecimal getExtractingMoney(Long uid) {
+ DaoQuery daoQuery = new DaoQuery();
+ daoQuery.uid = uid;
+ daoQuery.state = Extract.STATE_NOT_PROCESS;
+ BigDecimal money = extractMapper.sumMoney(daoQuery);
+
+ return money == null ? new BigDecimal(0) : money;
+ }
+
@Transactional(rollbackFor = Exception.class)
@Override
--
Gitblit v1.8.0