From a9129b96fa14c77df166f367be1d8220c8f9d0b7 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 19 一月 2019 15:14:04 +0800
Subject: [PATCH] 用户等级+用户设置
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 e9a5fc6..364b000 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
@@ -24,6 +24,7 @@
import com.yeshi.fanli.dao.mybatis.ExtractAuditRecordMapper;
import com.yeshi.fanli.dao.mybatis.ExtractMapper;
import com.yeshi.fanli.dao.mybatis.ExtractRecordMapper;
+import com.yeshi.fanli.dao.mybatis.HongBaoV2Mapper;
import com.yeshi.fanli.dao.mybatis.MoneyRecordMapper;
import com.yeshi.fanli.dao.mybatis.PayInfoMapper;
import com.yeshi.fanli.dao.mybatis.SystemMapper;
@@ -141,11 +142,14 @@
private HongBaoMapper hongBaoMapper;
@Resource
+ private HongBaoV2Mapper hongBaoV2Mapper;
+
+ @Resource
private PushService pushService;
@Resource
private UserNotificationService userNotificationService;
-
+
@Resource
private UserMoneyDetailMapper userMoneyDetailMapper;
@@ -312,7 +316,7 @@
AccountDetails ad = AccountDetailsFactory.create("-" + extract.getMoney(), AccountDetailsFactory.TIXIAN, null,
extract, user);
accountDetailsMapper.insertSelective(ad);
-
+
// 鏂扮増璧勯噾璇︽儏
try {
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createExtract(extract);
@@ -325,7 +329,6 @@
e1.printStackTrace();
}
}
-
userNotificationService.extractApply(extract.getUserInfo().getId());
@@ -478,7 +481,7 @@
AccountDetails ad = AccountDetailsFactory.create("+" + extract.getMoney(), AccountDetailsFactory.HUIKUAN,
null, extract, extract.getUserInfo());
accountDetailsMapper.insertSelective(ad);
-
+
// 鏂扮増璧勯噾璇︽儏
try {
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createExtractReject(extract);
@@ -491,8 +494,6 @@
e1.printStackTrace();
}
}
-
-
try {
@@ -554,8 +555,8 @@
@Override
public void checkExtract(String uid) throws ExtractException {
- int count = hongBaoMapper.getCountByUidAndState(Long.parseLong(uid), HongBao.STATE_YILINGQU);
- if (count == 0)
+ Long count = hongBaoV2Mapper.countByUidAndState(Long.parseLong(uid), HongBao.STATE_YILINGQU);
+ if (count == null || count == 0)
throw new ExtractException(1, "娌℃湁宸插埌璐︾殑绾㈠寘");
List<Integer> list = extractMapper.checkExtract(uid);
if (list != null && list.size() > 0 && list.get(0) == 0)
--
Gitblit v1.8.0