From 678dd30c708e7457228a7696573ada707f810269 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 06 十二月 2019 17:27:15 +0800
Subject: [PATCH] 会员审核 + 队员激活
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java | 106 ++++++++++++++--------------------------------------
1 files changed, 29 insertions(+), 77 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
index addd16c..f1070e2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
@@ -15,7 +15,6 @@
import com.aliyun.openservices.ons.api.Message;
import com.aliyun.openservices.ons.api.Producer;
-import com.google.gson.Gson;
import com.yeshi.fanli.dao.mybatis.ThreeSaleMapper;
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum;
@@ -503,98 +502,45 @@
@Override
@Transactional
public void bindRelationshipByInviteCode(UserInfo invitee, UserInfo inviter) throws ThreeSaleException {
-
if (invitee == null || inviter == null)
throw new ThreeSaleException(1, "鐢ㄦ埛淇℃伅涓虹┖");
- // 鑾峰彇鏈夋晥鐨勯個璇峰叧绯�
- ThreeSale threeSale = threeSaleMapper.getRelationshipByBossIdAndWorkerId(inviter.getId(), invitee.getId());
-
- if (threeSale != null) {
- // 鏈夋晥鍏崇郴--鐢熸晥
- threeSale.setBoss(inviter);
- threeSale.setWorker(invitee);
- threeSale.setState(true);
- threeSale.setExpire(ThreeSale.EXPIRE_NORMAL);
- threeSale.setSucceedTime(java.lang.System.currentTimeMillis());
- threeSale.setUpdateTime(java.lang.System.currentTimeMillis());
- threeSaleMapper.updateByPrimaryKeySelective(threeSale);
- } else {
- // 鏂板缓绔嬬‘瀹氬叧绯�
- threeSale = new ThreeSale();
- threeSale.setBoss(inviter);
- threeSale.setWorker(invitee);
- threeSale.setState(true);
- threeSale.setExpire(ThreeSale.EXPIRE_NORMAL);
- threeSale.setSucceedTime(java.lang.System.currentTimeMillis());
- threeSale.setCreateTime(java.lang.System.currentTimeMillis());
- threeSale.setUpdateTime(java.lang.System.currentTimeMillis());
- threeSaleMapper.insertSelective(threeSale);
- }
-
- List<ThreeSale> listExpire = threeSaleMapper.getExpireRecord(inviter.getId(), invitee.getId());
- if (listExpire != null && listExpire.size() > 0) {
- // 鍒犻櫎鍘嗗彶閫氱煡
- for (ThreeSale saleExpire : listExpire) {
- msgInviteDetailService.deleteByThreeSale(saleExpire);
- }
- // 鍒犻櫎宸插け鏁堝叧绯�
- threeSaleMapper.deleteExpireRecord(inviter.getId(), invitee.getId());
- }
+ // 鏂板缓绔嬬‘瀹氬叧绯�
+ ThreeSale threeSale = new ThreeSale();
+ threeSale.setBoss(inviter);
+ threeSale.setWorker(invitee);
+ threeSale.setState(true);
+ threeSale.setExpire(ThreeSale.EXPIRE_NORMAL);
+ threeSale.setSucceedTime(java.lang.System.currentTimeMillis());
+ threeSale.setCreateTime(java.lang.System.currentTimeMillis());
+ threeSale.setUpdateTime(java.lang.System.currentTimeMillis());
+ threeSaleMapper.insertSelective(threeSale);
inviteSuccess(inviter.getId(), invitee.getId(), threeSale);
}
@Override
@Transactional
- public void bindRelationshipByWX(UserInfo invitee, Long inviterId, ThreeSale threeSaleOld)
- throws ThreeSaleException {
-
- if (invitee == null || (inviterId == null && threeSaleOld == null))
+ public void bindRelationshipByWX(UserInfo invitee, Long inviterId)throws ThreeSaleException {
+ if (invitee == null || inviterId == null)
throw new ThreeSaleException(1, "鐢ㄦ埛淇℃伅涓虹┖");
-
- ThreeSale threeSale = null;
- if (inviterId != null) {
// 鏂板缓绔嬬‘瀹氬叧绯�
- threeSale = new ThreeSale();
- threeSale.setBoss(new UserInfo(inviterId));
- threeSale.setWorker(invitee);
- threeSale.setState(true);
- threeSale.setExpire(ThreeSale.EXPIRE_NORMAL);
- threeSale.setSucceedTime(java.lang.System.currentTimeMillis());
- threeSale.setCreateTime(java.lang.System.currentTimeMillis());
- threeSale.setUpdateTime(java.lang.System.currentTimeMillis());
- threeSaleMapper.insertSelective(threeSale);
-
- // 閭�璇峰叧绯诲け鏁� 1.5.3 涔嬪墠澶辨晥
- if (threeSaleOld != null) {
- ThreeSale three = new ThreeSale();
- three.setId(threeSaleOld.getId());
- three.setExpire(ThreeSale.EXPIRE_OUTOFDATE);
- three.setUpdateTime(java.lang.System.currentTimeMillis());
- threeSaleMapper.updateByPrimaryKeySelective(three);
- }
- } else if (threeSaleOld != null && inviterId == null) {
- // 1.5.3 涔嬪墠鐢熸晥
- threeSaleOld.setState(true);
- threeSaleOld.setExpire(ThreeSale.EXPIRE_NORMAL);
- threeSaleOld.setSucceedTime(java.lang.System.currentTimeMillis());
- threeSaleOld.setUpdateTime(java.lang.System.currentTimeMillis());
- threeSaleMapper.updateByPrimaryKeySelective(threeSaleOld);
-
- threeSale = threeSaleOld;
- }
-
- if (threeSale == null) {
- throw new ThreeSaleException(1, "鍏崇郴缁戝畾澶辫触");
- }
+ ThreeSale threeSale = new ThreeSale();
+ threeSale.setBoss(new UserInfo(inviterId));
+ threeSale.setWorker(invitee);
+ threeSale.setState(true);
+ threeSale.setExpire(ThreeSale.EXPIRE_NORMAL);
+ threeSale.setSucceedTime(java.lang.System.currentTimeMillis());
+ threeSale.setCreateTime(java.lang.System.currentTimeMillis());
+ threeSale.setUpdateTime(java.lang.System.currentTimeMillis());
+ threeSaleMapper.insertSelective(threeSale);
UserInfo boss = userInfoService.selectByPKey(threeSale.getBoss().getId());
threeSale.setBoss(boss);
threeSale.setWorker(invitee);
-
+
+ // 閭�璇锋垚鍔燂細娑堟伅銆佺浉鍏冲鐞�
inviteSuccess(boss.getId(), invitee.getId(), threeSale);
-
}
/**
@@ -669,4 +615,10 @@
public ThreeSale getByWorkerIdAndTime(Long workerId, long time) {
return threeSaleMapper.getByWorkerIdAndTime(workerId, time);
}
+
+ @Override
+ public void inviteSeparate(Long workerId, Long bossId) {
+ threeSaleMapper.inviteSeparate(workerId, bossId);
+ }
+
}
--
Gitblit v1.8.0