From e3732fa01883aa7a93f7398e39b01b0009155b06 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 14 三月 2019 09:46:36 +0800
Subject: [PATCH] 等级代码调整
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java | 73 ++++++++----------------------------
1 files changed, 17 insertions(+), 56 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 364b000..c73444f 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
@@ -18,31 +18,24 @@
import com.alipay.api.request.AlipayFundTransToaccountTransferRequest;
import com.alipay.api.response.AlipayFundTransToaccountTransferResponse;
import com.google.gson.Gson;
-import com.yeshi.fanli.dao.mybatis.AccountDetailsMapper;
import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;
import com.yeshi.fanli.dao.mybatis.AlipayAccountValidNormalHistoryMapper;
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;
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
-import com.yeshi.fanli.dao.mybatis.hongbao.HongBaoMapper;
import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;
-import com.yeshi.fanli.dao.user.AccountDetailsDao;
import com.yeshi.fanli.dao.user.AccountMessageDao;
import com.yeshi.fanli.dao.user.ExtractDao;
import com.yeshi.fanli.dao.user.ExtractRecordDao;
-import com.yeshi.fanli.dao.user.MoneyRecordDao;
-import com.yeshi.fanli.entity.bus.user.AccountDetails;
+import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;
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;
@@ -54,12 +47,11 @@
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.msg.UserMoneyMsgNotificationService;
import com.yeshi.fanli.service.inter.push.PushService;
-import com.yeshi.fanli.service.inter.user.AccountDetailsService;
import com.yeshi.fanli.service.inter.user.AccountMessageService;
import com.yeshi.fanli.service.inter.user.ExtractRecordService;
import com.yeshi.fanli.service.inter.user.ExtractService;
-import com.yeshi.fanli.service.inter.user.MoneyRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserNotificationService;
import com.yeshi.fanli.util.CMQManager;
@@ -67,7 +59,6 @@
import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.factory.AccountDetailsFactory;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
import net.sf.json.JSONObject;
@@ -81,8 +72,6 @@
@Resource
private UserInfoService userInfoService;
- @Resource
- private MoneyRecordService moneyRecordService;
@Resource
private ConfigService configService;
@@ -93,8 +82,6 @@
@Resource
private SystemConfigService systemConfigService;
- @Resource
- private AccountDetailsService accountDetailsService;
@Resource
private AccountMessageService accountMessageService;
@@ -112,22 +99,10 @@
private ExtractRecordDao extractRecordDao;
@Resource
- private MoneyRecordDao moneyRecordDao;
-
- @Resource
- private AccountDetailsDao accountDetailsDao;
-
- @Resource
private AccountMessageDao accountMessageDao;
@Resource
private PayInfoMapper payInfoMapper;
-
- @Resource
- private AccountDetailsMapper accountDetailsMapper;
-
- @Resource
- private MoneyRecordMapper moneyRecordMapper;
@Resource
private AccountMessageMapper accountMessageMapper;
@@ -137,9 +112,6 @@
@Resource
private SystemMapper systemMapper;
-
- @Resource
- private HongBaoMapper hongBaoMapper;
@Resource
private HongBaoV2Mapper hongBaoV2Mapper;
@@ -152,6 +124,9 @@
@Resource
private UserMoneyDetailMapper userMoneyDetailMapper;
+
+ @Resource
+ private UserMoneyMsgNotificationService userMoneyMsgNotificationService;
@Resource
private AlipayAccountValidNormalHistoryMapper alipayAccountValidNormalHistoryMapper;
@@ -197,9 +172,9 @@
}
@Transactional
- public synchronized void rejectExtract(long id, String reason, long extractTime, AdminUser admin)
+ public synchronized void rejectExtract(long id, String reason, AdminUser admin)
throws ObjectStateException, NotExistObjectException {
- Extract find = extractDao.find(Extract.class, id);
+ Extract find = extractMapper.selectByPrimaryKey(id);
if (find == null) {
throw new NotExistObjectException("涓嶅瓨鍦ㄨ瀵硅薄");
@@ -212,9 +187,6 @@
UserInfo user = find.getUserInfo();
userInfoMapper.addHongBaoByUid(user.getId(), find.getMoney());
-
- // 鍒犻櫎鎻愮幇璁板綍
- moneyRecordMapper.deleteMoneyRecordByExtractId(id);
// 鏇存柊鍘熸潵鐨勭姸鎬�
Extract updateExtract = new Extract();
@@ -251,14 +223,9 @@
// 鏇存柊鎻愮幇璁板綍瀹℃牳琛�
extractAuditRecordMapper.updateByPrimaryKeySelective(auditRecord);
-
- AccountDetails ad = AccountDetailsFactory.create("+" + find.getMoney(), AccountDetailsFactory.HUIKUAN, null,
- find, find.getUserInfo());
- accountDetailsMapper.insertSelective(ad);
// 鏂扮増璧勯噾璇︽儏
try {
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createExtractReject(find);
- userMoneyDetail.setId(ad.getId());
userMoneyDetailMapper.insert(userMoneyDetail);
} catch (UserMoneyDetailException e2) {
try {
@@ -274,6 +241,9 @@
} catch (Exception e) {
e.printStackTrace();
}
+
+ // 鏂扮増閫氱煡
+ userMoneyMsgNotificationService.extractFail(find, reason);
}
/**
@@ -308,19 +278,9 @@
// 鍑忓幓璐︽埛璧勯噾
userInfoMapper.subHongBaoByUid(extract.getUserInfo().getId(), extract.getMoney());
- MoneyRecord moneyRecord = new MoneyRecord(user, null, extract.getMoney(), "鎻愮幇", "", extract.getExtractTime(),
- 2);
- moneyRecord.setExtract(extract);
- moneyRecordMapper.insertSelective(moneyRecord);
-
- AccountDetails ad = AccountDetailsFactory.create("-" + extract.getMoney(), AccountDetailsFactory.TIXIAN, null,
- extract, user);
- accountDetailsMapper.insertSelective(ad);
-
// 鏂扮増璧勯噾璇︽儏
try {
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createExtract(extract);
- userMoneyDetail.setId(ad.getId());
userMoneyDetailMapper.insert(userMoneyDetail);
} catch (UserMoneyDetailException e2) {
try {
@@ -331,6 +291,8 @@
}
userNotificationService.extractApply(extract.getUserInfo().getId());
+ // 娣诲姞鏂扮増閫氱煡
+ userMoneyMsgNotificationService.extractApplay(extract);
if ("鏄�".equals(autoExtract)) {
LogHelper.userInfo("uid=" + user.getId() + ",鎻愪氦杞处鐢宠!");
@@ -478,14 +440,9 @@
userInfoMapper.addHongBaoByUid(user.getId(), extract.getMoney());
- AccountDetails ad = AccountDetailsFactory.create("+" + extract.getMoney(), AccountDetailsFactory.HUIKUAN,
- null, extract, extract.getUserInfo());
- accountDetailsMapper.insertSelective(ad);
-
// 鏂扮増璧勯噾璇︽儏
try {
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createExtractReject(extract);
- userMoneyDetail.setId(ad.getId());
userMoneyDetailMapper.insert(userMoneyDetail);
} catch (UserMoneyDetailException e2) {
try {
@@ -507,6 +464,8 @@
e.printStackTrace();
}
+ // 鏂扮増鎻愮幇
+ userMoneyMsgNotificationService.extractFail(extract, null);
}
}
@@ -530,6 +489,7 @@
Extract updateExtract = new Extract();
updateExtract.setId(extract.getId());
updateExtract.setState(Constant.EXTRACT_PASS);
+ updateExtract.setReceiveTime(new Date());
updateExtract.setReason("鎻愮幇鎴愬姛");
extractMapper.updateByPrimaryKeySelective(updateExtract);
@@ -542,7 +502,8 @@
} catch (Exception e) {
e.printStackTrace();
}
-
+ // 鏂扮増閫氱煡
+ userMoneyMsgNotificationService.extractSuccess(extract);
}
/**
--
Gitblit v1.8.0