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 | 97 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 71 insertions(+), 26 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 5e09016..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
@@ -7,24 +7,22 @@
import javax.annotation.Resource;
-import org.hibernate.annotations.LazyCollection;
-import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
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.ThreeSale;
import com.yeshi.fanli.entity.bus.user.UserInfo;
-import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;
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
@@ -38,6 +36,11 @@
@Resource
private ThreeSaleSerivce threeSaleSerivce;
+
+ @Resource
+ private MsgAccountDetailService msgAccountDetailService;
+
+
@Override
public void addUserVIPPreInfo(UserVIPPreInfo info) throws UserVIPPreInfoException {
@@ -105,7 +108,7 @@
}
// 閭�璇疯鍗�
- long countZiGou = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,
+ long countZiGou =hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,
HongBaoV2.TYPE_ZIGOU);
// 閭�璇疯鍗�
long countShare = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,
@@ -137,17 +140,38 @@
* @param secondTeam
*/
private boolean oneProcess(Long uid, long countZiGou, long countShare, long firstTeam, long secondTeam) {
- 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;
+ 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 +"浜�";
}
- 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;
}
/**
@@ -160,17 +184,38 @@
* @param secondTeam
*/
private boolean twoProcess(Long uid, long countZiGou, long countShare, long firstTeam, long secondTeam) {
- 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;
+ 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 +"浜�";
}
- 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;
}
}
--
Gitblit v1.8.0