From e1fcabf3946b7a5a6b76931657413a29735d0762 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 19 一月 2019 17:37:45 +0800
Subject: [PATCH] 新版消息通知

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 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..8a5b750 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
@@ -54,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;
@@ -154,6 +155,9 @@
 	private UserMoneyDetailMapper userMoneyDetailMapper;
 
 	@Resource
+	private UserMoneyMsgNotificationService userMoneyMsgNotificationService;
+
+	@Resource
 	private AlipayAccountValidNormalHistoryMapper alipayAccountValidNormalHistoryMapper;
 
 	public List<Extract> getExtractInfoByUid(long uid) {
@@ -199,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("涓嶅瓨鍦ㄨ瀵硅薄");
@@ -274,6 +278,9 @@
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
+
+		// 鏂扮増閫氱煡
+		userMoneyMsgNotificationService.extractFail(find, reason);
 	}
 
 	/**
@@ -331,6 +338,8 @@
 		}
 
 		userNotificationService.extractApply(extract.getUserInfo().getId());
+		// 娣诲姞鏂扮増閫氱煡
+		userMoneyMsgNotificationService.extractApplay(extract);
 
 		if ("鏄�".equals(autoExtract)) {
 			LogHelper.userInfo("uid=" + user.getId() + ",鎻愪氦杞处鐢宠!");
@@ -507,6 +516,8 @@
 				e.printStackTrace();
 			}
 
+			// 鏂扮増鎻愮幇
+			userMoneyMsgNotificationService.extractFail(extract, null);
 		}
 	}
 
@@ -542,7 +553,8 @@
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-
+		// 鏂扮増閫氱煡
+		userMoneyMsgNotificationService.extractSuccess(extract);
 	}
 
 	/**

--
Gitblit v1.8.0