From 70c9043f312a52a922cb15490d90a172b3515060 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 28 二月 2019 14:07:00 +0800
Subject: [PATCH] 奖励详情跳转地址调整
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java | 80 ++++++++++++++++++++++++++++-----------
1 files changed, 57 insertions(+), 23 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 849c6e4..2fec606 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
@@ -10,9 +10,6 @@
import javax.annotation.Resource;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
import org.hibernate.HibernateException;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
@@ -32,10 +29,15 @@
import com.yeshi.fanli.service.inter.config.InviteGetMoneyService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.msg.MsgInviteDetailService;
import com.yeshi.fanli.service.inter.msg.UserInviteMsgNotificationService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.ThreeSaleCMQManager;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
@Service
public class ThreeSaleSerivceImpl implements ThreeSaleSerivce {
@@ -57,9 +59,12 @@
@Resource
private ThreeSaleMapper threeSaleMapper;
-
+
@Resource
private UserInviteMsgNotificationService userInviteMsgNotificationService;
+
+ @Resource
+ private MsgInviteDetailService msgInviteDetailService;
public UserInfo getBoss(final long uid) {
return (UserInfo) dao.excute(new HibernateCallback<UserInfo>() {
@@ -112,14 +117,20 @@
threeSale.setUpdateTime(java.lang.System.currentTimeMillis());
threeSale.setWorker(inviteeUser);
threeSaleMapper.insertSelective(threeSale);
-
- // 鍒犻櫎宸插け鏁堝叧绯�
- threeSaleMapper.deleteExpireRecord(inviter.getId(), inviteeUser.getId());
-
- //鍒涘缓閫氱煡
+
+ List<ThreeSale> listExpire = threeSaleMapper.getExpireRecord(inviter.getId(), inviteeUser.getId());
+ if (listExpire != null && listExpire.size() > 0) {
+ // 鍒犻櫎澶辨晥
+ for (ThreeSale saleExpire : listExpire) {
+ msgInviteDetailService.deleteByThreeSale(saleExpire);
+ }
+ // 鍒犻櫎宸插け鏁堝叧绯�
+ threeSaleMapper.deleteExpireRecord(inviter.getId(), inviteeUser.getId());
+ }
+
+ // 鍒涘缓閫氱煡
userInviteMsgNotificationService.inviteScan(inviter.getId(), threeSale);
-
-
+
} else {// 鏄凡缁忓瓨鍦ㄧ殑鐢ㄦ埛
// 鐢ㄦ埛宸茬粡瀛樺湪鎴戜滑鐨勭敤鎴峰簱涓�
@@ -145,10 +156,20 @@
threeSale.setUpdateTime(java.lang.System.currentTimeMillis());
threeSale.setWorker(invitee);
threeSaleMapper.insertSelective(threeSale);
-
+
// 鍒犻櫎宸插け鏁堝叧绯�
threeSaleMapper.deleteExpireRecord(inviter.getId(), invitee.getId());
-
+
+ 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());
+ }
+
userInviteMsgNotificationService.inviteScan(inviter.getId(), threeSale);
// threeSaleSerivce.bind(invitee, inviter);
@@ -176,7 +197,9 @@
dao.update(threeSale);
if (inviter != null)
reComputeUserRank(inviter.getId());
- //閫氱煡
+ //娣诲姞鍒伴槦鍒�
+ ThreeSaleCMQManager.getInstance().addThreeSaleMsg(threeSale);
+ // 閫氱煡
userInviteMsgNotificationService.inviteSuccess(inviter.getId(), threeSale);
// }
// });
@@ -595,8 +618,7 @@
public List<ThreeSale> listByWorkerId(Long workerId) {
return threeSaleMapper.listByWorkerId(workerId);
}
-
-
+
@Override
public int getSuccessRelationshipNum(Long uid) {
return threeSaleMapper.getSuccessRelationshipNum(uid);
@@ -605,14 +627,13 @@
@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());
-
+ ThreeSale threeSale = threeSaleMapper.getRelationshipByBossIdAndWorkerId(inviter.getId(), invitee.getId());
+
if (threeSale != null) {
// 鏈夋晥鍏崇郴--鐢熸晥
threeSale.setState(true);
@@ -631,13 +652,26 @@
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());
}
+
// 閭�璇锋秷鎭�
userInviteMsgNotificationService.inviteSuccess(inviter.getId(), threeSale);
-
}
+ @Override
+ public long countSuccessFirstTeam(Long uid) {
+ return threeSaleMapper.countFirstTeam(uid,1);
+ }
+
}
--
Gitblit v1.8.0