From 7bedd903b10c125660d25373ffea23201bed22cc Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 14 十一月 2019 14:10:19 +0800
Subject: [PATCH] 邀请成功新版消息

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java |  141 +++++++++++++++++++++++++----------------------
 1 files changed, 75 insertions(+), 66 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
index c17cb30..c85b54a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
@@ -14,6 +14,8 @@
 import com.yeshi.fanli.dao.mybatis.redpack.RedPackWinInviteMapper;
 import com.yeshi.fanli.dto.msg.MsgRedPackAddContentDTO;
 import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;
+import com.yeshi.fanli.entity.bus.user.ThreeSale;
+import com.yeshi.fanli.entity.bus.user.UserActiveLog;
 import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.entity.order.CommonOrder;
@@ -24,6 +26,7 @@
 import com.yeshi.fanli.service.inter.redpack.RedPackBalanceService;
 import com.yeshi.fanli.service.inter.redpack.RedPackConfigService;
 import com.yeshi.fanli.service.inter.redpack.RedPackWinInviteService;
+import com.yeshi.fanli.service.inter.user.UserActiveLogService;
 import com.yeshi.fanli.service.inter.user.UserInfoService;
 import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRecordService;
 import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
@@ -31,6 +34,9 @@
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.MoneyBigDecimalUtil;
 import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.VersionUtil;
+import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;
+import com.yeshi.fanli.util.annotation.redpack.RedPackGetVersionLimit;
 import com.yeshi.fanli.util.factory.RedPackDetailFactory;
 import com.yeshi.fanli.vo.order.CommonOrderVO;
 
@@ -64,6 +70,9 @@
 	@Resource	
 	private IntegralTaskRecordService integralTaskRecordService;
 	
+	@Resource
+	private UserActiveLogService userActiveLogService;
+	
 	
 	@Override
 	public List<RedPackWinInvite> getRewardList(int start, int count, Long uid) {
@@ -77,66 +86,50 @@
 	}
 	
 	@Override
+	public BigDecimal getRewardMoney(Long uid) {
+		return redPackWinInviteMapper.getRewardMoney(uid);
+	}
+	
+	
+	@RequestSerializableByKeyService(key = "#uid")
 	@Transactional(rollbackFor = Exception.class)
+	@Override
 	public void orderArriveReward(Long uid, Integer source, String orderNo) throws Exception {
-		if (uid == null || source == null || orderNo == null)
+		if (uid == null || source == null || StringUtil.isNullOrEmpty(orderNo))
 			return;
 		
-		// 涓婁竴绾х殑濂栧姳
-		UserInfo boss = threeSaleSerivce.getBoss(uid);
-		if(boss != null) {
-			firstReward(uid, source, orderNo);
-			firstSharedOrderRewardToBoss(boss.getId(), uid, source, orderNo);
-			firstSharedOrderRewardTheMonthToBoss(boss.getId(), uid, source, orderNo);
-		}
+		ThreeSale threeSale = threeSaleSerivce.getByWorkerIdAndTime(uid, Constant.RED_PACK_REWARD_TIME);
+		if(threeSale == null)
+			return;
+			
+		Long bossId = threeSale.getBoss().getId();
+		UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(bossId);
+		if (activeLog == null) 
+			return;
+		
+		// 灏忎簬2.0.2鐗堟湰涓嶅鍔�
+		if (!VersionUtil.greaterThan_2_0_2("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",
+				activeLog.getVersionCode()))
+			return;
+		
+		// 濂栧姳涓婄骇
+		bossReward(bossId, uid, source, orderNo);
 	}
+	
 	
 	/**
-	 * 琚個璇蜂汉涓嬮鍗曡繑鍒╋紙涓嬪崟灏辩粰锛夛細
-	 * 瀹屾垚棣栫瑪璁㈠崟 锛堝凡鍒拌处锛� 棣栧崟=涓嶉檺鍒堕噾棰濄�佷笉闄愬埗鍟嗗搧銆佷笉闄愬埗鏁伴噺銆佷笉闄愬埗璁㈠崟绫诲瀷锛�
+	 * 涓婄骇濂栧姳
 	 * @param uid
+	 * @param teamUid
 	 * @param source
 	 * @param orderNo
-	 * @param bossId
+	 * @throws Exception
 	 */
 	@Transactional
-	private void firstReward(Long uid, Integer source, String orderNo) throws Exception{
-		// 濂栧姳涓�娆�
-		long total = redPackWinInviteMapper.countByUidAndType(uid, RedPackWinInviteTypeEnum.newUserReward.name());
-		if (total > 1)
-			return;
-		
-		// 1銆佸垽鏂槸鍚︾敤鎴烽涓鍗�
-		CommonOrderVO order = commonOrderService.firstValidOrderByUid(uid);
-		if (order == null || source == order.getSourceType() || orderNo.equals(order.getOrderNo())) 
-			return;
-		
-		// 閲戦
-		BigDecimal money = new BigDecimal(redPackConfigService.getValueByKey("new_user_first_order"));
-		
-		// 3銆佽幏寰楃孩鍖呰褰�
-		RedPackWinInvite winInvite = new RedPackWinInvite();
-		winInvite.setCreateTime(new Date());
-		winInvite.setUpdateTime(new Date());
-		winInvite.setType(RedPackWinInviteTypeEnum.newUserReward);
-		winInvite.setUid(uid);
-		winInvite.setTeamUid(null);
-		winInvite.setMoney(money);
-		winInvite.setSource(source);
-		winInvite.setOrderNo(orderNo);
-		redPackWinInviteMapper.insertSelective(winInvite);
-		
-		// 4銆佸鍔犵孩鍖�
-		redPackBalanceService.addRedPack(uid, money, RedPackDetailFactory.createNewUserReward(winInvite));
-		
-		//娑堟伅
-		MsgRedPackAddContentDTO dto = new MsgRedPackAddContentDTO();
-		dto.setTitle("绾㈠寘澧炲姞");
-		dto.setMoney("楼" + money.setScale(2));
-		dto.setBalance("楼" + redPackBalanceService.getBalance(uid).setScale(2));
-		userMoneyMsgNotificationService.redPackMsg(uid, MsgTypeMoneyTypeEnum.redPackNewUserReward, new Gson().toJson(dto), "绾㈠寘鍙敤浜庤喘涔颁細鍛�");
+	private void  bossReward(Long uid, Long teamUid, Integer source, String orderNo)  throws Exception {
+		firstSharedOrderRewardToBoss(uid, teamUid, source, orderNo);
+		firstSharedOrderRewardTheMonthToBoss(uid, teamUid, source, orderNo);
 	}
-	
 	
 	/**
 	 * 涓婄骇濂栧姳锛氳閭�璇蜂汉瀹屾垚棣栫瑪鍒嗕韩璁㈠崟 锛堝凡鍒拌处锛� 
@@ -149,16 +142,17 @@
 	private void firstSharedOrderRewardToBoss(Long uid, Long inviteeUid, Integer source, String orderNo) throws Exception{
 		// 鍚屼竴闃熷憳濂栧姳涓�娆�
 		long totalReward = redPackWinInviteMapper.countByUidAndTeamUidAndType(uid, inviteeUid, RedPackWinInviteTypeEnum.firstSharedOrder.name());
-		if (totalReward > 1)
+		if (totalReward > 0)
 			return;
 		
 		// 1銆佸垽鏂槸鍚︽槸鏀圭敤鎴烽涓垎浜鍗�
 		CommonOrderVO order = commonOrderService.firstValidOrderByUidAndType(inviteeUid, 2);
-		if (order == null || source == order.getSourceType() || orderNo.equals(order.getOrderNo())) 
+		if (order == null || source != order.getSourceType() || !orderNo.equals(order.getOrderNo())) 
 			return;
 		
 		// 2銆佸垽鏂槸绗嚑涓汉
 		long total = redPackWinInviteMapper.countByUidAndType(uid, RedPackWinInviteTypeEnum.firstSharedOrder.name());
+		
 		
 		// 璁＄畻搴斿鍔犵孩鍖呴噾棰�
 		BigDecimal money = new BigDecimal(redPackConfigService.getValueByKey("first_shared_order"));
@@ -188,7 +182,8 @@
 		dto.setTitle("绾㈠寘澧炲姞");
 		dto.setMoney("楼" + money.setScale(2));
 		dto.setBalance("楼" + redPackBalanceService.getBalance(uid).setScale(2));
-		userMoneyMsgNotificationService.redPackMsg(uid, MsgTypeMoneyTypeEnum.redPackFirstSharedOrder, new Gson().toJson(dto), "绾㈠寘鍙敤浜庤喘涔颁細鍛�");
+		userMoneyMsgNotificationService.redPackMsg(uid, MsgTypeMoneyTypeEnum.redPackFirstSharedOrder, 
+				new Gson().toJson(dto), "璇峰埌鈥滄垜鐨�-绾㈠寘鈥濅腑鏌ョ湅");
 	}
 	
 	
@@ -201,9 +196,9 @@
 	 */
 	@Transactional
 	private void firstSharedOrderRewardTheMonthToBoss(Long uid, Long inviteeUid, Integer source, String orderNo) throws Exception{
-		// 1銆佸垽鏂槸鍚︽槸鏈湀棣栧崟
-		CommonOrderVO order = commonOrderService.firstValidOrderTheMonthByUidAndType(inviteeUid, 2);
-		if (order == null || source == order.getSourceType() || orderNo.equals(order.getOrderNo()) ||
+		// 1銆佸垽鏂槸鍚︽槸涓婁釜鏈堥鍗�
+		CommonOrderVO order = commonOrderService.firstValidOrderLastMonthByUidAndType(inviteeUid, 2);
+		if (order == null || source != order.getSourceType() || !orderNo.equals(order.getOrderNo()) ||
 				order.getAccountTime() == null) 
 			return;
 		
@@ -218,7 +213,7 @@
 		
 		// 绗竴娆″埌璐︾殑娆℃湀寮�濮嬭繛缁�15涓湀 鑷劧鏈堣幏寰楋紙宸插埌璐︼級
 		int monthSpace = DateUtil.getMonthSpace( order.getAccountTime(), firstorder.getAccountTime());
-		if (monthSpace == 0 || monthSpace > Constant.RED_PACK_REWARd_MONTH) 
+		if (monthSpace == 0 || monthSpace > Constant.RED_PACK_REWARD_MONTH) 
 			return;
 		
 		
@@ -247,21 +242,34 @@
 		dto.setTitle("绾㈠寘澧炲姞");
 		dto.setMoney("楼" + money.setScale(2));
 		dto.setBalance("楼" + redPackBalanceService.getBalance(uid).setScale(2));
-		userMoneyMsgNotificationService.redPackMsg(uid, MsgTypeMoneyTypeEnum.redPackMonthSharedOrder, new Gson().toJson(dto), "绾㈠寘鍙敤浜庤喘涔颁細鍛�");
+		userMoneyMsgNotificationService.redPackMsg(uid, MsgTypeMoneyTypeEnum.redPackMonthSharedOrder,
+				new Gson().toJson(dto), "璇峰埌鈥滄垜鐨�-绾㈠寘鈥濅腑鏌ョ湅");
 	}
 	
 	
-
-	@Transactional
-	private void inviteSucceedReward(Long uid) throws Exception{
+	@Override
+	@RequestSerializableByKeyService(key = "#uid")
+	@Transactional(rollbackFor = Exception.class)
+	public void inviteSucceedReward(Long uid) throws Exception{
 		// 楠岃瘉鏄惁瀛樺湪涓婄骇
-		UserInfo boss = threeSaleSerivce.getBoss(uid);
-		if(boss == null) 
+		ThreeSale threeSale = threeSaleSerivce.getByWorkerIdAndTime(uid, Constant.RED_PACK_REWARD_TIME);
+		if (threeSale == null)
+			return;
+		// 涓婄骇id
+		Long bossId = threeSale.getBoss().getId();
+			
+		UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(bossId);
+		if (activeLog == null)
 			return;
 		
+		// 灏忎簬2.0.2鐗堟湰涓嶅鍔�
+		if (!VersionUtil.greaterThan_2_0_2("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",
+				activeLog.getVersionCode()))
+			return;
+
 		// 鍚屼竴闃熷憳濂栧姳涓�娆�
-		long totalReward = redPackWinInviteMapper.countByUidAndTeamUidAndType(boss.getId(), uid, RedPackWinInviteTypeEnum.inviteSucceed.name());
-		if (totalReward > 1)
+		long totalReward = redPackWinInviteMapper.countByUidAndTeamUidAndType(bossId, uid, RedPackWinInviteTypeEnum.inviteSucceed.name());
+		if (totalReward > 0)
 			return;
 		
 		// 1銆佺粦瀹氱數璇濆彿鐮�
@@ -304,20 +312,21 @@
 			winInvite.setCreateTime(new Date());
 			winInvite.setUpdateTime(new Date());
 			winInvite.setType(RedPackWinInviteTypeEnum.inviteSucceed);
-			winInvite.setUid(boss.getId());
+			winInvite.setUid(bossId);
 			winInvite.setTeamUid(uid);
 			winInvite.setMoney(money);
 			redPackWinInviteMapper.insertSelective(winInvite);
 			
 			// 澧炲姞绾㈠寘
-			redPackBalanceService.addRedPack(boss.getId(), money, RedPackDetailFactory.createInvite(winInvite));
+			redPackBalanceService.addRedPack(bossId, money, RedPackDetailFactory.createInvite(winInvite));
 			
 			// 娑堟伅
 			MsgRedPackAddContentDTO dto = new MsgRedPackAddContentDTO();
 			dto.setTitle("绾㈠寘澧炲姞");
 			dto.setMoney("楼" + money.setScale(2));
-			dto.setBalance("楼" + redPackBalanceService.getBalance(boss.getId()).setScale(2));
-			userMoneyMsgNotificationService.redPackMsg(boss.getId(), MsgTypeMoneyTypeEnum.redPackInviteSucceed, new Gson().toJson(dto), "绾㈠寘鍙敤浜庤喘涔颁細鍛�");
+			dto.setBalance("楼" + redPackBalanceService.getBalance(bossId).setScale(2));
+			userMoneyMsgNotificationService.redPackMsg(bossId, MsgTypeMoneyTypeEnum.redPackInviteSucceed,
+					new Gson().toJson(dto), "璇峰埌鈥滄垜鐨�-绾㈠寘鈥濅腑鏌ョ湅");
 		}
 	}
 	

--
Gitblit v1.8.0