From c53f14a5c5d0bb6623987de84ef1bb8f8a8dbb3f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 14 一月 2019 18:13:24 +0800
Subject: [PATCH] Merge branch 'div1'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 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 eb3c6f7..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;
@@ -254,7 +258,7 @@
// 鏂扮増璧勯噾璇︽儏
try {
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createExtractReject(find);
- userMoneyDetail.setId(find.getId());
+ userMoneyDetail.setId(ad.getId());
userMoneyDetailMapper.insert(userMoneyDetail);
} catch (UserMoneyDetailException e2) {
try {
@@ -262,12 +266,6 @@
} catch (Exception e3) {
e3.printStackTrace();
}
- }
-
- try {
- UserMoneyDetailFactory.createExtractReject(find);
- } catch (UserMoneyDetailException e1) {
- e1.printStackTrace();
}
try {
@@ -318,11 +316,11 @@
AccountDetails ad = AccountDetailsFactory.create("-" + extract.getMoney(), AccountDetailsFactory.TIXIAN, null,
extract, user);
accountDetailsMapper.insertSelective(ad);
-
+
// 鏂扮増璧勯噾璇︽儏
try {
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createExtract(extract);
- userMoneyDetail.setId(extract.getId());
+ userMoneyDetail.setId(ad.getId());
userMoneyDetailMapper.insert(userMoneyDetail);
} catch (UserMoneyDetailException e2) {
try {
@@ -331,7 +329,6 @@
e1.printStackTrace();
}
}
-
userNotificationService.extractApply(extract.getUserInfo().getId());
@@ -484,11 +481,11 @@
AccountDetails ad = AccountDetailsFactory.create("+" + extract.getMoney(), AccountDetailsFactory.HUIKUAN,
null, extract, extract.getUserInfo());
accountDetailsMapper.insertSelective(ad);
-
+
// 鏂扮増璧勯噾璇︽儏
try {
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createExtractReject(extract);
- userMoneyDetail.setId(extract.getId());
+ userMoneyDetail.setId(ad.getId());
userMoneyDetailMapper.insert(userMoneyDetail);
} catch (UserMoneyDetailException e2) {
try {
@@ -497,8 +494,6 @@
e1.printStackTrace();
}
}
-
-
try {
@@ -560,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