From 4a901a88c00c4c48d5b6f4fef55de2a2fd82749a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期日, 26 四月 2020 14:43:24 +0800
Subject: [PATCH] 用户授权激活限制

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteValidNumServiceImpl.java |   74 +++++++++++++++----------------------
 1 files changed, 30 insertions(+), 44 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteValidNumServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteValidNumServiceImpl.java
index 7d92754..084ea0f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteValidNumServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteValidNumServiceImpl.java
@@ -246,29 +246,22 @@
 					continue;
 				}
 				Long wid = firstTeam.getWorker().getId();
-				Long succeedTime = firstTeam.getSucceedTime();
-				if (succeedTime == null) {
-					succeedTime = firstTeam.getCreateTime();
-				}
-				
-				// 鍗曪紙鍒嗕韩 + 鑷喘锛夊疄浠樻澶т簬1鍏�
-				long countValid = commonOrderService.countOrderByUidAndSettled(wid, Constant.VIP_ORDER_PAY);
-				if (countValid > 0) {
+				String uniqueKey = StringUtil.Md5(wid + "#" + UserInviteValidRecord.TYPE_ONE);
+				UserInviteValidRecord record = userInviteValidRecordMapper.selectByUniqueKey(uniqueKey);
+				if (record != null) {
 					countTeam1 ++;
-					try {
-						String uniqueKey = StringUtil.Md5(wid + "#" + UserInviteValidRecord.TYPE_ONE);
-						UserInviteValidRecord record = userInviteValidRecordMapper.selectByUniqueKey(uniqueKey);
-						if (record == null) {
-							record = new UserInviteValidRecord();
-							record.setUid(uid);
-							record.setWorkerId(wid);
-							record.setType(UserInviteValidRecord.TYPE_ONE);
-							record.setUniqueKey(uniqueKey);
-							record.setCreateTime(new Date());
-							userInviteValidRecordMapper.insertSelective(record);
-						}
-					} catch (Exception e) {
-						 
+				} else {
+					long countValid = commonOrderService.countOrderByUidAndSettled(wid, Constant.VIP_ORDER_PAY);
+					if (countValid > 0) {
+						countTeam1 ++;
+						
+						record = new UserInviteValidRecord();
+						record.setUid(uid);
+						record.setWorkerId(wid);
+						record.setType(UserInviteValidRecord.TYPE_ONE);
+						record.setUniqueKey(uniqueKey);
+						record.setCreateTime(new Date());
+						userInviteValidRecordMapper.insertSelective(record);
 					}
 				}
 			}
@@ -309,30 +302,23 @@
 					continue;
 				}
 				Long wid = team.getWorker().getId();
-				Long succeedTime = team.getSucceedTime();
-				if (succeedTime == null) {
-					succeedTime = team.getCreateTime();
-				}
-				// 鍗曪紙鍒嗕韩 + 鑷喘锛夊疄浠樻澶т簬1鍏�
-				long countValid = commonOrderService.countOrderByUidAndSettled(wid, Constant.VIP_ORDER_PAY);
-				if (countValid > 0) {
+				String uniqueKeySuper = StringUtil.Md5(wid + "#" + UserInviteValidRecord.TYPE_TWO);
+				UserInviteValidRecord recordSuper = userInviteValidRecordMapper.selectByUniqueKey(uniqueKeySuper);
+				if (recordSuper != null) {
 					countTeam2 ++;
-					try {
-						String uniqueKeySuper = StringUtil.Md5(wid + "#" + UserInviteValidRecord.TYPE_TWO);
-						UserInviteValidRecord recordSuper = userInviteValidRecordMapper.selectByUniqueKey(uniqueKeySuper);
-						if (recordSuper == null) {
-							recordSuper = new UserInviteValidRecord();
-							recordSuper.setUid(superUid);
-							recordSuper.setWorkerId(wid);
-							recordSuper.setType(UserInviteValidRecord.TYPE_TWO);
-							recordSuper.setUniqueKey(uniqueKeySuper);
-							recordSuper.setCreateTime(new Date());
-							userInviteValidRecordMapper.insertSelective(recordSuper);
-						}
-					} catch (Exception e) {
-					 
+				} else {
+					long countValid = commonOrderService.countOrderByUidAndSettled(wid, Constant.VIP_ORDER_PAY);
+					if (countValid > 0) {
+						countTeam2 ++;
+						
+						recordSuper = new UserInviteValidRecord();
+						recordSuper.setUid(superUid);
+						recordSuper.setWorkerId(wid);
+						recordSuper.setType(UserInviteValidRecord.TYPE_TWO);
+						recordSuper.setUniqueKey(uniqueKeySuper);
+						recordSuper.setCreateTime(new Date());
+						userInviteValidRecordMapper.insertSelective(recordSuper);
 					}
-					
 				}
 			}
 		}

--
Gitblit v1.8.0