From 16d6bde39c100ab04fe94c0357b0257c25341614 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 04 三月 2019 17:42:30 +0800
Subject: [PATCH] 邀请关系生效通知修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
index f35f4e1..e1b144c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
@@ -186,23 +186,37 @@
}
@Transactional
- public void effective(UserInfo invitee) {
- List<ThreeSale> list = dao.list("from ThreeSale ts where ts.worker.id = ? and ts.state=0 and ts.expire=0",
- new Serializable[] { invitee.getId() });
+ public void effective(UserInfo worker) {
+ List<ThreeSale> list = threeSaleMapper.listByWorkerId(worker.getId());
+ if (list != null)
+ for (int i = 0; i < list.size(); i++) {
+ if (list.get(i).getState() != null && list.get(i).getState() == false
+ && list.get(i).getExpire() == ThreeSale.EXPIRE_NORMAL) {
+ ;
+ } else {
+ list.remove(i);
+ i--;
+ }
+ }
if (list.size() > 0) {
- ThreeSale threeSale = list.get(0);
- UserInfo inviter = threeSale.getBoss();
- threeSale.setState(true);
- threeSale.setSucceedTime(System.currentTimeMillis());
- dao.update(threeSale);
- if (inviter != null)
- reComputeUserRank(inviter.getId());
- //娣诲姞鍒伴槦鍒�
- ThreeSaleCMQManager.getInstance().addThreeSaleMsg(threeSale);
+ ThreeSale oldSale = list.get(0);
+
+ ThreeSale update = new ThreeSale(list.get(0).getId());
+ update.setState(true);
+ update.setSucceedTime(System.currentTimeMillis());
+ threeSaleMapper.updateByPrimaryKeySelective(update);
+
+ oldSale.setState(update.getState());
+ oldSale.setSucceedTime(update.getSucceedTime());
+
+ UserInfo inviter = list.get(0).getBoss();
+ // 涓嶄互閭�璇蜂汉鏁拌绠楃瓑绾�
+ // if (inviter != null)
+ // reComputeUserRank(inviter.getId());
+ // 娣诲姞鍒伴槦鍒�
+ ThreeSaleCMQManager.getInstance().addThreeSaleMsg(oldSale);
// 閫氱煡
- userInviteMsgNotificationService.inviteSuccess(inviter.getId(), threeSale);
- // }
- // });
+ userInviteMsgNotificationService.inviteSuccess(inviter.getId(), oldSale);
}
}
@@ -665,16 +679,16 @@
threeSaleMapper.deleteExpireRecord(inviter.getId(), invitee.getId());
}
- //娣诲姞鍒伴槦鍒�
+ // 娣诲姞鍒伴槦鍒�
ThreeSaleCMQManager.getInstance().addThreeSaleMsg(threeSale);
-
+
// 閭�璇锋秷鎭�
userInviteMsgNotificationService.inviteSuccess(inviter.getId(), threeSale);
}
-
+
@Override
public long countSuccessFirstTeam(Long uid) {
- return threeSaleMapper.countFirstTeam(uid,1);
+ return threeSaleMapper.countFirstTeam(uid, 1);
}
}
--
Gitblit v1.8.0