From 61c67aaf53de97ba4c1ad2570df06d302c0607c7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 05 三月 2019 18:27:15 +0800
Subject: [PATCH] 邀请昵称获取方式修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
index 5265f49..8c14fc6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -1042,7 +1042,9 @@
 	
 	@Transactional
 	@Override
-	public void activatedWelfareFreeCoupon(Long uid) {
+	public void activatedWelfareFreeCoupon(Long uid, String fromNickName) {
+		
+		LogHelper.test("鍒告縺娲�:"+uid);
 		if (uid == null) {
 			return;
 		}
@@ -1065,9 +1067,11 @@
 		
 		for (UserSystemCoupon userSystemCoupon: list) {
 			// 婵�娲�
-			userSystemCoupon.setStateActivated(1);
-			userSystemCoupon.setUpdateTime(new Date());
-			userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
+			UserSystemCoupon update=new UserSystemCoupon();
+			update.setId(userSystemCoupon.getId());
+			update.setStateActivated(1);
+			update.setUpdateTime(new Date());
+			userSystemCouponMapper.updateByPrimaryKeySelective(update);
 			
 			Integer state = userSystemCoupon.getState();
 			if (UserSystemCoupon.STATE_OVERDUE == state) {
@@ -1076,7 +1080,11 @@
 			
 			// 娑堟伅鎺ㄩ��
 			try {
-				userOtherMsgNotificationService.welfareCouponActive(userSystemCoupon, new UserInfo(uid));
+				UserInfo userInfo = new UserInfo();
+				userInfo.setId(uid);
+				userInfo.setNickName(fromNickName);
+				
+				userOtherMsgNotificationService.welfareCouponActive(userSystemCoupon, userInfo);
 			} catch(Exception e) {
 				try {
 					LogHelper.errorDetailInfo(e);
@@ -1450,7 +1458,5 @@
 		userInfoExtraService.saveUserInfoExtra(userInfoExtra);
 	
 	}
-	
-	
-	
 }
+	

--
Gitblit v1.8.0