From b6c37e4bc38db88a360d0f2c6099183f9bb75bdc Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 22 四月 2019 14:31:59 +0800
Subject: [PATCH] 券推送插入
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java | 205 +++++++++++++++++++++++++++++----------------------
1 files changed, 116 insertions(+), 89 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 90e7d4f..edd78d3 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
@@ -1,7 +1,7 @@
package com.yeshi.fanli.service.impl.user;
-import java.io.Serializable;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -18,53 +18,49 @@
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.MoneyRecordMapper;
+import com.yeshi.fanli.dao.mybatis.HongBaoV2Mapper;
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.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.dao.mybatis.money.UserMoneyDetailMapper;
+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.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.PayInfo;
+import com.yeshi.fanli.entity.bus.user.UserAccountBindingHistory;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.common.AdminUser;
+import com.yeshi.fanli.entity.money.UserMoneyDetail;
+import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
import com.yeshi.fanli.exception.ExtractException;
import com.yeshi.fanli.exception.NotExistObjectException;
import com.yeshi.fanli.exception.ObjectStateException;
+import com.yeshi.fanli.exception.money.UserMoneyDetailException;
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.hongbao.HongBaoV2Service;
+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.UserAccountBindingHistoryService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
import com.yeshi.fanli.service.inter.user.UserNotificationService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.Constant;
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;
@@ -72,13 +68,7 @@
public class ExtractServiceImpl implements ExtractService {
@Resource
- private ExtractDao extractDao;
-
- @Resource
private UserInfoService userInfoService;
-
- @Resource
- private MoneyRecordService moneyRecordService;
@Resource
private ConfigService configService;
@@ -90,12 +80,6 @@
private SystemConfigService systemConfigService;
@Resource
- private AccountDetailsService accountDetailsService;
-
- @Resource
- private AccountMessageService accountMessageService;
-
- @Resource
private ExtractMapper extractMapper;
@Resource
@@ -105,25 +89,7 @@
private UserInfoMapper userInfoMapper;
@Resource
- 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;
@@ -132,10 +98,10 @@
private ExtractRecordMapper extractRecordMapper;
@Resource
- private SystemMapper systemMapper;
+ private HongBaoV2Mapper hongBaoV2Mapper;
@Resource
- private HongBaoMapper hongBaoMapper;
+ private HongBaoV2Service hongBaoV2Service;
@Resource
private PushService pushService;
@@ -144,26 +110,24 @@
private UserNotificationService userNotificationService;
@Resource
+ private UserMoneyDetailMapper userMoneyDetailMapper;
+
+ @Resource
+ private UserMoneyMsgNotificationService userMoneyMsgNotificationService;
+
+ @Resource
private AlipayAccountValidNormalHistoryMapper alipayAccountValidNormalHistoryMapper;
- public List<Extract> getExtractInfoByUid(long uid) {
- return extractDao.list("from Extract e where e.userInfo.id=? and e.state != 2", new Serializable[] { uid });
- }
+ @Resource
+ private UserMoneyDetailService userMoneyDetailService;
+
+ @Resource
+ private UserAccountBindingHistoryService userAccountBindingHistoryService;
@Transactional
public Integer addExtract(Extract extract) {
Integer integer = extract(extract);
return integer;
- }
-
- public List<Extract> getExtractList(int index) {
- int start = index * Constant.PAGE_SIZE;
- return extractDao.list("from Extract e order by e.id desc", start, Constant.PAGE_SIZE, new Serializable[] {});
- }
-
- public int getCount() {
- Long lcount = extractDao.getCount("select count(e.id) from Extract e");
- return lcount.intValue();
}
@Transactional
@@ -187,9 +151,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("涓嶅瓨鍦ㄨ瀵硅薄");
@@ -202,9 +166,6 @@
UserInfo user = find.getUserInfo();
userInfoMapper.addHongBaoByUid(user.getId(), find.getMoney());
-
- // 鍒犻櫎鎻愮幇璁板綍
- moneyRecordMapper.deleteMoneyRecordByExtractId(id);
// 鏇存柊鍘熸潵鐨勭姸鎬�
Extract updateExtract = new Extract();
@@ -241,16 +202,27 @@
// 鏇存柊鎻愮幇璁板綍瀹℃牳琛�
extractAuditRecordMapper.updateByPrimaryKeySelective(auditRecord);
+ // 鏂扮増璧勯噾璇︽儏
+ try {
+ UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createExtractReject(find);
+ userMoneyDetailMapper.insert(userMoneyDetail);
+ } catch (UserMoneyDetailException e2) {
+ try {
+ LogHelper.errorDetailInfo(e2);
+ } catch (Exception e3) {
+ e3.printStackTrace();
+ }
+ }
- AccountDetails ad = AccountDetailsFactory.create("+" + find.getMoney(), AccountDetailsFactory.HUIKUAN, null,
- find, find.getUserInfo());
- accountDetailsMapper.insertSelective(ad);
try {
userNotificationService.extractWrong(user.getId(), find,
TimeUtil.getGernalTime(find.getExtractTime(), "yyyy-MM-dd HH:mm"));
} catch (Exception e) {
e.printStackTrace();
}
+
+ // 鏂扮増閫氱煡
+ userMoneyMsgNotificationService.extractFail(find, reason);
}
/**
@@ -261,6 +233,13 @@
*/
@Transactional
private Integer extract(Extract extract) {
+ UserAccountBindingHistory history = userAccountBindingHistoryService
+ .getLatestHistory(extract.getUserInfo().getId(), UserAccountBindingHistory.TYPE_PHONE);
+ // 鎵嬫満鍙锋洿鎹㈢粦瀹氱殑7澶╁唴涓嶈兘鎻愮幇
+ if (history != null && !history.getFirst()
+ && (System.currentTimeMillis() - history.getCreateTime().getTime()) < 1000 * 60 * 60 * 24 * 7L)
+ return 111;
+
final String autoExtract = configService.get("extract_way"); // 鏄惁鑷姩杞处
final String maxCount = configService.get("extract_count_day");
final String maxMoney = configService.get("extract_money_day");
@@ -285,16 +264,21 @@
// 鍑忓幓璐︽埛璧勯噾
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);
+ userMoneyDetailMapper.insert(userMoneyDetail);
+ } catch (UserMoneyDetailException e2) {
+ try {
+ LogHelper.errorDetailInfo(e2);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
userNotificationService.extractApply(extract.getUserInfo().getId());
+ // 娣诲姞鏂扮増閫氱煡
+ userMoneyMsgNotificationService.extractApplay(extract);
if ("鏄�".equals(autoExtract)) {
LogHelper.userInfo("uid=" + user.getId() + ",鎻愪氦杞处鐢宠!");
@@ -442,9 +426,17 @@
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);
+ userMoneyDetailMapper.insert(userMoneyDetail);
+ } catch (UserMoneyDetailException e2) {
+ try {
+ LogHelper.errorDetailInfo(e2);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
try {
@@ -458,6 +450,8 @@
e.printStackTrace();
}
+ // 鏂扮増鎻愮幇
+ userMoneyMsgNotificationService.extractFail(extract, null);
}
}
@@ -481,6 +475,7 @@
Extract updateExtract = new Extract();
updateExtract.setId(extract.getId());
updateExtract.setState(Constant.EXTRACT_PASS);
+ updateExtract.setReceiveTime(new Date());
updateExtract.setReason("鎻愮幇鎴愬姛");
extractMapper.updateByPrimaryKeySelective(updateExtract);
@@ -493,7 +488,8 @@
} catch (Exception e) {
e.printStackTrace();
}
-
+ // 鏂扮増閫氱煡
+ userMoneyMsgNotificationService.extractSuccess(extract);
}
/**
@@ -501,16 +497,47 @@
*/
@Override
public Extract getExtractById(long id) {
- return extractDao.find(Extract.class, id);
+ return extractMapper.selectByPrimaryKey(id);
}
+ @Transactional
@Override
- public void checkExtract(String uid) throws ExtractException {
- int count = hongBaoMapper.getCountByUidAndState(Long.parseLong(uid), HongBao.STATE_YILINGQU);
- if (count == 0)
+ public void checkExtract(Long uid) throws ExtractException {
+ Long count = hongBaoV2Mapper.countByUidAndState(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)
+ // 鑾峰彇鎵�鏈夋敹鍏ユ墍寰�
+ BigDecimal hongBaoMoney = hongBaoV2Service.computeMoneyByUidAndState(uid, HongBaoV2.STATE_YILINGQU);
+
+ Date now = new Date();
+ // 鑾峰彇鎻愮幇锛岃幏鍙栨彁鐜伴獙璇�
+ List<UserMoneyDetailTypeEnum> typeList = new ArrayList<>();
+ typeList.add(UserMoneyDetailTypeEnum.extract);
+ typeList.add(UserMoneyDetailTypeEnum.extractReject);
+ typeList.add(UserMoneyDetailTypeEnum.extractVerify);
+ BigDecimal extractMoney = userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, new Date(0),
+ now);
+ extractMoney = extractMoney.abs();
+ // 鑾峰彇缁存潈
+ typeList = new ArrayList<>();
+ typeList.add(UserMoneyDetailTypeEnum.weiQuan);
+ typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuan);
+ typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);
+ typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);
+ typeList.add(UserMoneyDetailTypeEnum.hongbaoDeduct);
+ BigDecimal weiqaunMoney = userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, new Date(0),
+ now);
+ weiqaunMoney = weiqaunMoney.abs();
+
+ BigDecimal balance = userInfoService.selectByPKey(uid).getMyHongBao();
+
+ BigDecimal compensateMoney = extractMapper.computeCompensateByUid(uid);
+ if (compensateMoney == null)
+ compensateMoney = new BigDecimal(0);
+
+ BigDecimal after = hongBaoMoney.subtract(extractMoney.add(weiqaunMoney).add(balance).add(compensateMoney));
+
+ if (after.compareTo(new BigDecimal("0")) != 0)
throw new ExtractException(2, "缁撶畻璧勯噾寮傚父");
}
--
Gitblit v1.8.0