From a6673284d4ec0b7c11079c65d940c9443d86d11e Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 06 三月 2019 15:21:48 +0800
Subject: [PATCH] 冲突

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
index 541d4c4..d6866c5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -70,6 +70,7 @@
 import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;
 import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
 import com.yeshi.fanli.service.inter.user.UserNotificationService;
+import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
 import com.yeshi.fanli.util.CMQManager;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
@@ -166,6 +167,9 @@
 
 	@Resource
 	private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
+
+	@Resource
+	private UserSystemCouponService userSystemCouponService;
 
 	@Override
 	public void processOrder(Map<String, List<TaoBaoOrder>> orders) {
@@ -497,7 +501,7 @@
 				userMoneyDetailMapper.insert(userMoneyDetail);
 			} catch (UserMoneyDetailException e1) {
 				try {
-					LogHelper.errorDetailInfo(e1);
+					LogHelper.errorDetailInfo(e1,"璁㈠崟鍙�:"+hongBaoOrder.getCommonOrder().getOrderNo(),"");
 				} catch (Exception e2) {
 					e2.printStackTrace();
 				}
@@ -524,7 +528,12 @@
 			// 鏂扮増閫氱煡
 			userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(),
 					userGoodsCount.get(uid), money, user.getMyHongBao());
-
+		}
+		// 閫氱煡鍏嶅崟鍒拌处
+		try {
+			userSystemCouponService.updateStateByArrivalAccount(hongBaoOrder.getCommonOrder().getOrderNo());
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
 
 		// 缁存潈鎵f锛�2018-08-05鍚庡紑濮嬪疄琛岋級

--
Gitblit v1.8.0