From d28bed1a1275131a5ca37f7da37961e2b518ac07 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 13:44:00 +0800
Subject: [PATCH] 淘礼金创建异常处理

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java |   27 +++++----------------------
 1 files changed, 5 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 fdfbf59..b538eb8 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
@@ -58,12 +58,10 @@
 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;
 import com.yeshi.fanli.util.GsonUtil;
 import com.yeshi.fanli.util.MoneyBigDecimalUtil;
-import com.yeshi.fanli.util.TimeUtil;
 import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
 
 import net.sf.json.JSONObject;
@@ -109,9 +107,6 @@
 
 	@Resource
 	private PushService pushService;
-
-	@Resource
-	private UserNotificationService userNotificationService;
 
 	@Resource
 	private UserMoneyDetailMapper userMoneyDetailMapper;
@@ -224,13 +219,6 @@
 		extractAuditRecordMapper.updateByPrimaryKeySelective(auditRecord);
 		// 鏂扮増璧勯噾璇︽儏
 
-		try {
-			userNotificationService.extractWrong(user.getId(), find,
-					TimeUtil.getGernalTime(find.getExtractTime(), "yyyy-MM-dd HH:mm"));
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
 		// 鏂扮増閫氱煡
 		userMoneyMsgNotificationService.extractFail(find, reason);
 	}
@@ -303,7 +291,6 @@
 		// 鍑忓幓璐︽埛璧勯噾
 		userMoneyService.subUserMoney(extract.getUserInfo().getId(), extract.getMoney(), userMoneyDetail);
 
-		userNotificationService.extractApply(extract.getUserInfo().getId());
 		// 娣诲姞鏂扮増閫氱煡
 		userMoneyMsgNotificationService.extractApplay(extract);
 
@@ -389,6 +376,7 @@
 	 */
 	@Transactional
 	private void extractByZhiFuBao(Extract extract, AdminUser adminUser) {
+		LogHelper.userErrorInfo("鎻愮幇:寮�濮嬮�氳繃鎻愮幇-"+extract.getId());
 		String privateKey = Constant.alipayConfig.getPrivateKey();
 		AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",
 				Constant.alipayConfig.getAppId(), privateKey, "json", "gbk", null, "RSA2");
@@ -407,15 +395,17 @@
 		AlipayFundTransToaccountTransferResponse response = null;
 		try {
 			response = alipayClient.execute(request);
+			LogHelper.userErrorInfo("鎻愮幇:鏀粯瀹濋�氳繃鎻愮幇鎴愬姛-"+extract.getId());
 		} catch (AlipayApiException e) {
 			e.printStackTrace();
-			LogHelper.userErrorInfo("鏀粯瀹濇彁鐜板紓甯革細" + response + ",鎻愮幇淇℃伅" + GsonUtil.toJson(extract));
+			LogHelper.userErrorInfo("鎻愮幇:鏀粯瀹濇彁鐜板紓甯革細" + response + ",鎻愮幇淇℃伅" + GsonUtil.toJson(extract));
 		}
 
 		try {
 			CMQManager.getInstance().addExtractResultMsg(extract, response, adminUser);
+			LogHelper.userErrorInfo("鎻愮幇:娣诲姞澶勭悊闃熷垪鎴愬姛-"+extract.getId());
 		} catch (Exception e) {
-			LogHelper.userErrorInfo("鏀粯瀹濇彁鐜癈MQ寮傚父锛�" + new Gson().toJson(response) + ",鎻愮幇淇℃伅" + GsonUtil.toJson(extract));
+			LogHelper.userErrorInfo("鎻愮幇:鏀粯瀹濇彁鐜癈MQ寮傚父锛�" + new Gson().toJson(response) + ",鎻愮幇淇℃伅" + GsonUtil.toJson(extract));
 		}
 	}
 
@@ -467,10 +457,6 @@
 			userMoneyService.addUserMoney(user.getId(), extract.getMoney(), userMoneyDetail);
 
 			try {
-
-				userNotificationService.extractTransferFail(user.getId(),
-						TimeUtil.getGernalTime(extract.getExtractTime(), "yyyy-MM-dd HH:mm"));
-
 				LogHelper.userInfo("鏀粯瀹濊浆璐﹀け璐�:[鎻愮幇IP锛�" + extract.getIp() + ",鎵�杞处鍙�:" + extract.getAccount() + ",鐪熷疄濮撳悕锛�"
 						+ extract.getName() + ",鎵�杞噾棰濓細" + extract.getMoney() + ",澶辫触鍘熷洜" + extract.getReason() + "]");
 
@@ -508,9 +494,6 @@
 		extractMapper.updateByPrimaryKeySelective(updateExtract);
 
 		try {
-			userNotificationService.extractSuccess(extract.getUserInfo().getId(), extract,
-					TimeUtil.getGernalTime(extract.getExtractTime(), "yyyy-MM-dd HH:mm"));
-
 			LogHelper.userInfo("鏀粯瀹濊浆璐︽垚鍔�:[鎻愮幇IP锛�" + extract.getIp() + ",鎵�杞处鍙�:" + extract.getAccount() + ",鐪熷疄濮撳悕锛�"
 					+ extract.getName() + ",鎵�杞噾棰濓細" + extract.getMoney() + "]");
 		} catch (Exception e) {

--
Gitblit v1.8.0