From c007868c62c7da5c9ce1bf0e77d9e5f8619826e4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 12 六月 2019 12:24:09 +0800
Subject: [PATCH] 查询默认有效调整
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 36 insertions(+), 22 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 7afddd7..103e439 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
@@ -28,6 +28,7 @@
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;
import com.yeshi.fanli.dto.HongBao;
+import com.yeshi.fanli.dto.money.ExtractOrderStatisticDTO;
import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord;
@@ -49,12 +50,14 @@
import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
import com.yeshi.fanli.service.inter.money.UserMoneyDebtService;
import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;
+import com.yeshi.fanli.service.inter.order.OrderUserStatisticService;
import com.yeshi.fanli.service.inter.push.PushService;
import com.yeshi.fanli.service.inter.user.ExtractRecordService;
import com.yeshi.fanli.service.inter.user.ExtractService;
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.UserMoneyService;
import com.yeshi.fanli.service.inter.user.UserNotificationService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.Constant;
@@ -128,6 +131,12 @@
@Resource
private UserMoneyDebtService userMoneyDebtService;
+ @Resource
+ private UserMoneyService userMoneyService;
+
+ @Resource
+ private OrderUserStatisticService orderUserStatisticService;
+
@Transactional
public Integer addExtract(Extract extract) {
Integer integer = extract(extract);
@@ -169,8 +178,15 @@
UserInfo user = find.getUserInfo();
- userInfoMapper.addHongBaoByUid(user.getId(), find.getMoney());
+ UserMoneyDetail userMoneyDetail = null;
+ try {
+ userMoneyDetail = UserMoneyDetailFactory.createExtractReject(find);
+ } catch (UserMoneyDetailException e1) {
+ e1.printStackTrace();
+ }
+ // 澧炲姞璧勯噾
+ userMoneyService.addUserMoney(user.getId(), find.getMoney(), userMoneyDetail);
// 鏇存柊鍘熸潵鐨勭姸鎬�
Extract updateExtract = new Extract();
updateExtract.setId(id);
@@ -207,16 +223,6 @@
// 鏇存柊鎻愮幇璁板綍瀹℃牳琛�
extractAuditRecordMapper.updateByPrimaryKeySelective(auditRecord);
// 鏂扮増璧勯噾璇︽儏
- try {
- UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createExtractReject(find);
- userMoneyDetailMapper.insert(userMoneyDetail);
- } catch (UserMoneyDetailException e2) {
- try {
- LogHelper.errorDetailInfo(e2);
- } catch (Exception e3) {
- e3.printStackTrace();
- }
- }
try {
userNotificationService.extractWrong(user.getId(), find,
@@ -270,15 +276,20 @@
ExtractAuditRecord auditRecord = new ExtractAuditRecord();
auditRecord.setBeforeMoney(user.getMyHongBao());
auditRecord.setExtract(extract);
+
+ // 缁熻鏁版嵁
+ int orderCount50More = orderUserStatisticService.countHongBaoOrderCount50MoreByUid(user.getId());
+ BigDecimal weiQuanOrderFanAmount = orderUserStatisticService.sumWeiQuanOrderFanAmountByUid(user.getId());
+ int weiQuanOrderCount = orderUserStatisticService.countWeiQuanOrderByUid(user.getId());
+ int safeOrderCount = orderUserStatisticService.countSafeOrderByUid(user.getId());
+ auditRecord.setExtraInfoStr(new Gson().toJson(new ExtractOrderStatisticDTO(orderCount50More, weiQuanOrderCount,
+ weiQuanOrderFanAmount, safeOrderCount)));
extractAuditRecordMapper.insertSelective(auditRecord);
- // 鍑忓幓璐︽埛璧勯噾
- userInfoMapper.subHongBaoByUid(extract.getUserInfo().getId(), extract.getMoney());
-
// 鏂扮増璧勯噾璇︽儏
+ UserMoneyDetail userMoneyDetail = null;
try {
- UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createExtract(extract);
- userMoneyDetailMapper.insert(userMoneyDetail);
+ userMoneyDetail = UserMoneyDetailFactory.createExtract(extract);
} catch (UserMoneyDetailException e2) {
try {
LogHelper.errorDetailInfo(e2);
@@ -286,6 +297,9 @@
e1.printStackTrace();
}
}
+
+ // 鍑忓幓璐︽埛璧勯噾
+ userMoneyService.subUserMoney(extract.getUserInfo().getId(), extract.getMoney(), userMoneyDetail);
userNotificationService.extractApply(extract.getUserInfo().getId());
// 娣诲姞鏂扮増閫氱煡
@@ -436,12 +450,10 @@
updateExtract.setReason(msg);
extractMapper.updateByPrimaryKeySelective(updateExtract);
- userInfoMapper.addHongBaoByUid(user.getId(), extract.getMoney());
-
+ UserMoneyDetail userMoneyDetail = null;
// 鏂扮増璧勯噾璇︽儏
try {
- UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createExtractReject(extract);
- userMoneyDetailMapper.insert(userMoneyDetail);
+ userMoneyDetail = UserMoneyDetailFactory.createExtractReject(extract);
} catch (UserMoneyDetailException e2) {
try {
LogHelper.errorDetailInfo(e2);
@@ -449,6 +461,8 @@
e1.printStackTrace();
}
}
+ // 澧炲姞璧勯噾
+ userMoneyService.addUserMoney(user.getId(), extract.getMoney(), userMoneyDetail);
try {
@@ -718,7 +732,7 @@
}
@Override
- public double countTodayMoney(Long uid) {
- return extractMapper.countTodayMoney(uid);
+ public BigDecimal sumTodayApplyMoney(Long uid) {
+ return extractMapper.sumToadyApplyByUid(uid);
}
}
--
Gitblit v1.8.0