From d1bf4588a39bcba69fd39f3cc3b3a6c439e25cb6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 19 十二月 2018 17:28:19 +0800
Subject: [PATCH] Merge branch 'master' into dev-moneydetail
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
index 0ec17ce..90e7d4f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
@@ -39,15 +39,18 @@
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord;
import com.yeshi.fanli.entity.bus.user.ExtractRecord;
+import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.MoneyRecord;
import com.yeshi.fanli.entity.bus.user.PayInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.common.AdminUser;
+import com.yeshi.fanli.exception.ExtractException;
import com.yeshi.fanli.exception.NotExistObjectException;
import com.yeshi.fanli.exception.ObjectStateException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemConfigService;
+import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.push.PushService;
import com.yeshi.fanli.service.inter.user.AccountDetailsService;
import com.yeshi.fanli.service.inter.user.AccountMessageService;
@@ -132,7 +135,7 @@
private SystemMapper systemMapper;
@Resource
- private HongBaoMapper hongBaoService;
+ private HongBaoMapper hongBaoMapper;
@Resource
private PushService pushService;
@@ -502,8 +505,13 @@
}
@Override
- public List<Integer> checkExtract(String uid) {
- return extractMapper.checkExtract(uid);
+ public void checkExtract(String uid) throws ExtractException {
+ int count = hongBaoMapper.getCountByUidAndState(Long.parseLong(uid), HongBao.STATE_YILINGQU);
+ if (count == 0)
+ throw new ExtractException(1, "娌℃湁宸插埌璐︾殑绾㈠寘");
+ List<Integer> list = extractMapper.checkExtract(uid);
+ if (list != null && list.size() > 0 && list.get(0) == 0)
+ throw new ExtractException(2, "缁撶畻璧勯噾寮傚父");
}
@Override
@@ -665,4 +673,8 @@
}
+ @Override
+ public double countTodayMoney(Long uid) {
+ return extractMapper.countTodayMoney(uid);
+ }
}
--
Gitblit v1.8.0