From 70c9043f312a52a922cb15490d90a172b3515060 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 28 二月 2019 14:07:00 +0800
Subject: [PATCH] 奖励详情跳转地址调整
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 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..6438b10 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;
@@ -53,6 +54,7 @@
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;
@@ -141,13 +143,19 @@
private HongBaoMapper hongBaoMapper;
@Resource
+ private HongBaoV2Mapper hongBaoV2Mapper;
+
+ @Resource
private PushService pushService;
@Resource
private UserNotificationService userNotificationService;
-
+
@Resource
private UserMoneyDetailMapper userMoneyDetailMapper;
+
+ @Resource
+ private UserMoneyMsgNotificationService userMoneyMsgNotificationService;
@Resource
private AlipayAccountValidNormalHistoryMapper alipayAccountValidNormalHistoryMapper;
@@ -195,7 +203,7 @@
@Transactional
public synchronized void rejectExtract(long id, String reason, long extractTime, AdminUser admin)
throws ObjectStateException, NotExistObjectException {
- Extract find = extractDao.find(Extract.class, id);
+ Extract find = extractMapper.selectByPrimaryKey(id);
if (find == null) {
throw new NotExistObjectException("涓嶅瓨鍦ㄨ瀵硅薄");
@@ -270,6 +278,9 @@
} catch (Exception e) {
e.printStackTrace();
}
+
+ // 鏂扮増閫氱煡
+ userMoneyMsgNotificationService.extractFail(find, reason);
}
/**
@@ -312,7 +323,7 @@
AccountDetails ad = AccountDetailsFactory.create("-" + extract.getMoney(), AccountDetailsFactory.TIXIAN, null,
extract, user);
accountDetailsMapper.insertSelective(ad);
-
+
// 鏂扮増璧勯噾璇︽儏
try {
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createExtract(extract);
@@ -325,9 +336,10 @@
e1.printStackTrace();
}
}
-
userNotificationService.extractApply(extract.getUserInfo().getId());
+ // 娣诲姞鏂扮増閫氱煡
+ userMoneyMsgNotificationService.extractApplay(extract);
if ("鏄�".equals(autoExtract)) {
LogHelper.userInfo("uid=" + user.getId() + ",鎻愪氦杞处鐢宠!");
@@ -478,7 +490,7 @@
AccountDetails ad = AccountDetailsFactory.create("+" + extract.getMoney(), AccountDetailsFactory.HUIKUAN,
null, extract, extract.getUserInfo());
accountDetailsMapper.insertSelective(ad);
-
+
// 鏂扮増璧勯噾璇︽儏
try {
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createExtractReject(extract);
@@ -491,8 +503,6 @@
e1.printStackTrace();
}
}
-
-
try {
@@ -506,6 +516,8 @@
e.printStackTrace();
}
+ // 鏂扮増鎻愮幇
+ userMoneyMsgNotificationService.extractFail(extract, null);
}
}
@@ -529,6 +541,7 @@
Extract updateExtract = new Extract();
updateExtract.setId(extract.getId());
updateExtract.setState(Constant.EXTRACT_PASS);
+ updateExtract.setReceiveTime(new Date());
updateExtract.setReason("鎻愮幇鎴愬姛");
extractMapper.updateByPrimaryKeySelective(updateExtract);
@@ -541,7 +554,8 @@
} catch (Exception e) {
e.printStackTrace();
}
-
+ // 鏂扮増閫氱煡
+ userMoneyMsgNotificationService.extractSuccess(extract);
}
/**
@@ -554,8 +568,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