From 1dc1b5e88283c2ea8cf53c9f014300b3ad0f53de Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 02 四月 2020 11:20:43 +0800
Subject: [PATCH] vip消息

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java |   37 ++++++++++++++++++++++++++++++-------
 1 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
index c99ebf7..37b5f01 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
@@ -14,6 +14,7 @@
 
 import com.yeshi.fanli.dao.mybatis.user.vip.UserVIPPreInfoMapper;
 import com.yeshi.fanli.dto.msg.MsgAccountVipDTO;
+import com.yeshi.fanli.dto.msg.MsgOtherSystemGiveDTO;
 import com.yeshi.fanli.entity.bus.user.HongBaoV2;
 import com.yeshi.fanli.entity.bus.user.ThreeSale;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -27,7 +28,9 @@
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
+import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;
 import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
+import com.yeshi.fanli.service.inter.user.UserInfoService;
 import com.yeshi.fanli.service.inter.user.UserInviteSeparateService;
 import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
 import com.yeshi.fanli.service.inter.user.integral.IntegralDetailService;
@@ -76,6 +79,12 @@
 	
 	@Resource
 	private UserInviteSeparateService userInviteSeparateService;
+	
+	@Resource
+	private UserInfoService userInfoService;
+	
+	@Resource
+	private UserOtherMsgNotificationService userOtherMsgNotificationService;
 	
 
 	@Override
@@ -267,6 +276,8 @@
 				// 璧犻�侀噾甯�
 				String goldcoin = userVipConfigService.getValueByKey("vip_pre_3_gift_goldcoin");
 				if (!StringUtil.isNullOrEmpty(goldcoin)) {
+					
+					int goldcoinNum = Integer.parseInt(goldcoin);
 					// 娣诲姞閲戝竵鏄庣粏
 					IntegralDetail detail = new IntegralDetail();
 					detail.setTitle("鍗囩骇VIP绂忓埄");
@@ -279,7 +290,12 @@
 					// 娣诲姞閲戝竵
 					userInfoExtraService.addGoldCoinByUid(uid, Integer.parseInt(goldcoin));
 					
-					//TODO 娑堟伅
+					// 娑堟伅
+					MsgOtherSystemGiveDTO dto = new MsgOtherSystemGiveDTO();
+					dto.setName("绯荤粺璧犻�� ");
+					dto.setReason("鎭枩浣狅紒鎴愬姛鍗囩骇涓烘櫘閫氫細鍛�");
+					dto.setDesc("鑾峰緱閲戝竵" + goldcoinNum+"鏋�");
+					userOtherMsgNotificationService.vipUpgradeReward(uid, "璇︽儏鏌ョ湅锛屽搴斾細鍛樻潈鐩�", dto);
 				}
 				
 				// 鏄惁瀛樺湪涓嬬骇鑴辩鏈熼檺 -鏇存柊涓嶈劚绂�
@@ -302,7 +318,13 @@
 		if (threeSale == null)
 			return;
 		
+		// 楠岃瘉涓婄骇鏄惁姝e父
 		Long bossId = threeSale.getBoss().getId();
+		UserInfo userInfo = userInfoService.getUserById(bossId);
+		if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {
+			return;
+		}
+		
 		// 楠岃瘉涓婄骇鏄惁宸叉槸浼氬憳
 		UserVIPPreInfo oldInfo = userVIPPreInfoMapper.selectByUidAndProcess(bossId, UserVIPPreInfo.PROCESS_1);
 		if (oldInfo != null) {
@@ -311,9 +333,6 @@
 		
 		// 娣诲姞鑴辩鍏崇郴鍊掕鏃�
 		userInviteSeparateService.addPreSeparateRecord(uid, bossId);
-		
-		// TODO 娑堟伅
-		
 	}
 	
 	
@@ -391,10 +410,14 @@
 						userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.rebatePercentCoupon.name(),
 								UserSystemCoupon.SOURCE_SYSTEM_PUSH, percent, false);
 					}
+					
+					// 娑堟伅
+					MsgOtherSystemGiveDTO dto = new MsgOtherSystemGiveDTO();
+					dto.setName("绯荤粺璧犻�� ");
+					dto.setReason("鎭枩浣狅紒鎴愬姛鍗囩骇涓洪珮绾т細鍛�");
+					dto.setDesc("鑾峰緱杩斿埄濂栧姳鍒�" + num +"寮�");
+					userOtherMsgNotificationService.vipUpgradeReward(uid, "璇︽儏鏌ョ湅锛屽搴斾細鍛樻潈鐩�", dto);
 				}
-				
-				// TODO 鍙戝埜娑堟伅
-				
 			} catch (Exception e) {
 				e.printStackTrace();
 				LogHelper.error(e);

--
Gitblit v1.8.0