From c3a5e164cbabbfc5f66e1356cb0de657ce3f58b9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 三月 2020 13:56:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java | 213 +++++++++++++++++++++++++++++++----------------------
1 files changed, 125 insertions(+), 88 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
index 4ca3a02..15fd8c8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
@@ -11,15 +11,18 @@
import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.user.vip.UserVIPPreInfoMapper;
+import com.yeshi.fanli.dto.msg.MsgAccountVipDTO;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
-import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;
+import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo;
import com.yeshi.fanli.exception.user.vip.UserVIPPreInfoException;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
-import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
+import com.yeshi.fanli.service.inter.user.msg.MsgAccountDetailService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPPreInfoService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;
@Service
@@ -27,15 +30,17 @@
@Resource
private UserVIPPreInfoMapper userVIPPreInfoMapper;
-
+
@Resource
private HongBaoV2CountService hongBaoV2CountService;
-
+
@Resource
private ThreeSaleSerivce threeSaleSerivce;
@Resource
- private UserVIPInfoService userVIPInfoService;
+ private MsgAccountDetailService msgAccountDetailService;
+
+
@Override
public void addUserVIPPreInfo(UserVIPPreInfo info) throws UserVIPPreInfoException {
@@ -68,45 +73,66 @@
return infoList.get(0);
}
-
@RequestSerializableByKeyService(key = "#uid")
@Transactional(rollbackFor = Exception.class)
@Override
- public void verifyVipCondition(Long uid) {
+ public void verifyVipPreInfo(Long uid, boolean inviteSuccess) {
if (uid == null || uid <= 0)
return;
- // 楠岃瘉鏄惁VIP
- boolean vip = userVIPInfoService.isVIP(uid);
- if (vip) {
- return;
- }
+ verifyCondition(uid);
- // 閭�璇疯鍗�
- long countZiGou = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY, HongBaoV2.TYPE_ZIGOU);
- // 閭�璇疯鍗�
- long countShare = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY, HongBaoV2.TYPE_SHARE_GOODS);
- // 闃熷憳
- long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
- long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);
-
- // 涓�闃舵
- boolean process1 = oneProcess(uid, countZiGou, countShare, firstTeam, secondTeam);
- if (!process1) {
- return;
+ // 楠岃瘉涓婄骇
+ if (inviteSuccess) {
+ UserInfo boss = threeSaleSerivce.getBoss(uid);
+ if (boss != null) {
+ verifyVipPreInfoBoss(boss.getId());
+ }
}
-
- // 涓�闃舵
- boolean process2 = twoProcess(uid, countZiGou, countShare, firstTeam, secondTeam);
- if (!process2) {
- return;
- }
-
- vipProcess(uid, countZiGou, countShare, firstTeam, secondTeam);
}
-
+
+ // 涓婄骇楠岃瘉
+ private void verifyVipPreInfoBoss(Long uid) {
+ if (uid == null || uid <= 0)
+ return;
+
+ verifyCondition(uid);
+ }
+
+ private void verifyCondition(Long uid) {
+ try {
+ // 楠岃瘉浜岄樁娈�
+ UserVIPPreInfo oldInfo = userVIPPreInfoMapper.selectByUidAndProcess(uid, UserVIPPreInfo.PROCESS_2);
+ if (oldInfo != null) {
+ return;
+ }
+
+ // 閭�璇疯鍗�
+ long countZiGou =hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,
+ HongBaoV2.TYPE_ZIGOU);
+ // 閭�璇疯鍗�
+ long countShare = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,
+ HongBaoV2.TYPE_SHARE_GOODS);
+ // 闃熷憳
+ long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
+ long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);
+
+ // 涓�闃舵
+ boolean process1 = oneProcess(uid, countZiGou, countShare, firstTeam, secondTeam);
+ if (!process1) {
+ return;
+ }
+
+ // 浜岄樁娈�
+ twoProcess(uid, countZiGou, countShare, firstTeam, secondTeam);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+
/**
* 涓�闃舵
+ *
* @param uid
* @param countZiGou
* @param countShare
@@ -114,27 +140,43 @@
* @param secondTeam
*/
private boolean oneProcess(Long uid, long countZiGou, long countShare, long firstTeam, long secondTeam) {
- UserVIPPreInfo oldInfo = userVIPPreInfoMapper.selectByUidAndProcess(uid, UserVIPPreInfo.PROCESS_1);
- if (oldInfo != null) {
- return true;
+ boolean process = false;
+ String msg = "";
+ if (countZiGou >= Constant.VIP_PROCESS_1_ZIGOU) {
+ process = true;
+ msg = "鎭枩浣狅紒杩斿埄璁㈠崟杈惧埌 "+ Constant.VIP_PROCESS_1_ZIGOU +"绗�";
+ } else if (countShare >= Constant.VIP_PROCESS_1_SHARE) {
+ process = true;
+ msg = "鎭枩浣狅紒鍒嗕韩璁㈠崟杈惧埌 "+ Constant.VIP_PROCESS_1_SHARE +"绗�";
+ } else if (firstTeam >= Constant.VIP_PROCESS_1_TEAM && secondTeam >= Constant.VIP_PROCESS_1_TEAM_SECOND) {
+ process = true;
+ msg = "鐩存帴绮変笣杈惧埌"+ Constant.VIP_PROCESS_1_TEAM +"浜猴紝闂存帴绮変笣杈惧埌 "+ Constant.VIP_PROCESS_1_TEAM_SECOND +"浜�";
}
-
- if (countZiGou >= Constant.VIP_PROCESS_1_ZIGOU || countShare >= Constant.VIP_PROCESS_1_SHARE
- || (firstTeam >= Constant.VIP_PROCESS_1_TEAM && secondTeam >= Constant.VIP_PROCESS_1_TEAM_SECOND)) {
- UserVIPPreInfo info = new UserVIPPreInfo();
- info.setUid(uid);
- info.setProcess(UserVIPPreInfo.PROCESS_1);
- info.setCreateTime(new Date());
- info.setUpdateTime(new Date());
- userVIPPreInfoMapper.insertSelective(info);
- return true;
- }
- return false;
+
+ if (process) {
+ try {
+ UserVIPPreInfo info = new UserVIPPreInfo();
+ info.setUid(uid);
+ info.setProcess(UserVIPPreInfo.PROCESS_1);
+ info.setCreateTime(new Date());
+ info.setUpdateTime(new Date());
+ addUserVIPPreInfo(info);
+
+ // 娑堟伅
+ MsgAccountVipDTO msgDto = new MsgAccountVipDTO();
+ msgDto.setStatus("绯荤粺宸插皢浣犵殑璐︽埛鐢卞揩鐪佽揪浜哄崌绾т负鏅�氫細鍛�");
+ msgDto.setEquity("浠庢敹鍒版湰娑堟伅璧凤紝浣犲皢鑾峰緱鍏ㄩ儴鏅�氫細鍛樻潈鐩�");
+ msgAccountDetailService.addMsgVIP(uid, msg, "濡傛湁鐤戦棶璇疯仈绯绘垜鐨�-浜哄伐瀹㈡湇", msgDto);
+ } catch (UserVIPPreInfoException e) {
+ e.printStackTrace();
+ }
+ }
+ return process;
}
-
-
+
/**
- * 涓�闃舵
+ * 浜岄樁娈�
+ *
* @param uid
* @param countZiGou
* @param countShare
@@ -142,43 +184,38 @@
* @param secondTeam
*/
private boolean twoProcess(Long uid, long countZiGou, long countShare, long firstTeam, long secondTeam) {
- UserVIPPreInfo oldInfo = userVIPPreInfoMapper.selectByUidAndProcess(uid, UserVIPPreInfo.PROCESS_2);
- if (oldInfo != null) {
- return true;
+ boolean process = false;
+ String msg = "";
+ if (countZiGou >= Constant.VIP_PROCESS_2_ZIGOU) {
+ process = true;
+ msg = "鎭枩浣狅紒杩斿埄璁㈠崟杈惧埌 "+ Constant.VIP_PROCESS_2_ZIGOU +"绗�";
+ } else if (countShare >= Constant.VIP_PROCESS_2_SHARE) {
+ process = true;
+ msg = "鎭枩浣狅紒鍒嗕韩璁㈠崟杈惧埌 "+ Constant.VIP_PROCESS_2_SHARE +"绗�";
+ } else if (firstTeam >= Constant.VIP_PROCESS_2_TEAM && secondTeam >= Constant.VIP_PROCESS_2_TEAM_SECOND) {
+ process = true;
+ msg = "鐩存帴绮変笣杈惧埌"+ Constant.VIP_PROCESS_2_TEAM +"浜猴紝闂存帴绮変笣杈惧埌 "+ Constant.VIP_PROCESS_2_TEAM_SECOND +"浜�";
}
-
- if (countZiGou >= Constant.VIP_PROCESS_2_ZIGOU || countShare >= Constant.VIP_PROCESS_2_SHARE
- || (firstTeam >= Constant.VIP_PROCESS_2_TEAM && secondTeam >= Constant.VIP_PROCESS_2_TEAM_SECOND)) {
- UserVIPPreInfo info = new UserVIPPreInfo();
- info.setUid(uid);
- info.setProcess(UserVIPPreInfo.PROCESS_2);
- info.setCreateTime(new Date());
- info.setUpdateTime(new Date());
- userVIPPreInfoMapper.insertSelective(info);
- return true;
- }
- return false;
+
+ if (process) {
+ try {
+ UserVIPPreInfo info = new UserVIPPreInfo();
+ info.setUid(uid);
+ info.setProcess(UserVIPPreInfo.PROCESS_2);
+ info.setCreateTime(new Date());
+ info.setUpdateTime(new Date());
+ addUserVIPPreInfo(info);
+
+ // 娑堟伅
+ MsgAccountVipDTO msgDto = new MsgAccountVipDTO();
+ msgDto.setStatus("绯荤粺宸插皢浣犵殑璐︽埛鐢辨櫘閫氫細鍛樺崌绾т负楂樼骇浼氬憳");
+ msgDto.setEquity("浠庢敹鍒版湰娑堟伅璧凤紝浣犲皢鑾峰緱鍏ㄩ儴楂樼骇浼氬憳鏉冪泭");
+ msgAccountDetailService.addMsgVIP(uid, msg, "濡傛湁鐤戦棶璇疯仈绯绘垜鐨�-浜哄伐瀹㈡湇", msgDto);
+ } catch (UserVIPPreInfoException e) {
+ e.printStackTrace();
+ }
+ }
+ return process;
}
-
-
- /**
- * 涓�闃舵
- * @param uid
- * @param countZiGou
- * @param countShare
- * @param firstTeam
- * @param secondTeam
- */
- private boolean vipProcess(Long uid, long countZiGou, long countShare, long firstTeam, long secondTeam) {
- if (countZiGou >= Constant.VIP_PROCESS_3_ZIGOU || countShare >= Constant.VIP_PROCESS_3_SHARE
- || (firstTeam >= Constant.VIP_PROCESS_3_TEAM && secondTeam >= Constant.VIP_PROCESS_3_TEAM_SECOND)) {
-
-
-
- return true;
- }
- return false;
- }
-
-
+
}
--
Gitblit v1.8.0