From 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 09 五月 2020 21:41:27 +0800
Subject: [PATCH] 2.1需求
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteValidNumServiceImpl.java | 76 +++++++++++++++----------------------
1 files changed, 31 insertions(+), 45 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..432814e 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);
}
}
}
@@ -302,37 +295,30 @@
}
int countTeam2 = 0;
- List<ThreeSale> listSecondTeam = threeSaleSerivce.listSecondTeam(0, Integer.MAX_VALUE, superUid);
+ List<ThreeSale> listSecondTeam = threeSaleSerivce.listSecondTeam(0, Integer.MAX_VALUE, superUid);
if (listSecondTeam != null && listSecondTeam.size() > 0) {
for (ThreeSale team: listSecondTeam) {
if (team.getWorker() == null || team.getWorker().getId() == null) {
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