From 17e98d7bcc27072f97976d24eb504abb02914891 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 11 四月 2020 09:20:14 +0800
Subject: [PATCH] 消息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java | 125 +++++++++++++++++++++++++++++------------
1 files changed, 88 insertions(+), 37 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 c99ebf7..6a9a770 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
@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.impl.user.vip;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@@ -11,12 +12,14 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.yeshi.utils.DateUtil;
import com.yeshi.fanli.dao.mybatis.user.vip.UserVIPPreInfoMapper;
-import com.yeshi.fanli.dto.msg.MsgAccountVipDTO;
+import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;
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.UserInfoRegister;
import com.yeshi.fanli.entity.bus.user.UserInviteValidNum;
import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
import com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo;
@@ -27,18 +30,24 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
+import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
+import com.yeshi.fanli.service.inter.user.UserInfoRegisterService;
+import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserInviteSeparateService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.service.inter.user.integral.IntegralDetailService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.invite.UserInviteValidNumService;
-import com.yeshi.fanli.service.inter.user.msg.MsgAccountDetailService;
+import com.yeshi.fanli.service.inter.user.msg.UserAccountMsgNotificationService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPPreInfoService;
import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;
+import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
+import com.yeshi.fanli.vo.msg.CommonMsgItemVO;
+import com.yeshi.fanli.vo.msg.CommonMsgItemVOFactory;
@Service
public class UserVIPPreInfoServiceImpl implements UserVIPPreInfoService {
@@ -52,9 +61,6 @@
@Resource
private ThreeSaleSerivce threeSaleSerivce;
- @Resource
- private MsgAccountDetailService msgAccountDetailService;
-
@Resource
private UserVipConfigService userVipConfigService;
@@ -76,6 +82,18 @@
@Resource
private UserInviteSeparateService userInviteSeparateService;
+
+ @Resource
+ private UserInfoService userInfoService;
+
+ @Resource
+ private UserOtherMsgNotificationService userOtherMsgNotificationService;
+
+ @Resource
+ private UserAccountMsgNotificationService userAccountMsgNotificationService;
+
+ @Resource
+ private UserInfoRegisterService userInfoRegisterService;
@Override
@@ -209,10 +227,12 @@
* @param secondTeam
*/
@Transactional(rollbackFor = Exception.class)
- private boolean oneProcess(Long uid, long countZiGou, long countShare, long firstTeam, long secondTeam) {
- boolean process = false;
- String msg = "";
-
+ private boolean oneProcess(Long uid, long countZiGou, long countShare, long firstTeam, long secondTeam) throws Exception{
+ UserVIPPreInfo oldInfo = userVIPPreInfoMapper.selectByUidAndProcess(uid, UserVIPPreInfo.PROCESS_1);
+ if (oldInfo != null) {
+ return true;
+ }
+
long limitZiGou = 0;
String zigou = userVipConfigService.getValueByKey("vip_pre_3_zigou_order_count");
if (!StringUtil.isNullOrEmpty(zigou)) {
@@ -237,15 +257,22 @@
limitSecond = Long.parseLong(second);
}
+ Integer type = null;
+ long targetNum1 = 0L;
+ Long targetNum2 = 0L;
+ boolean process = false;
if (countZiGou >= limitZiGou) {
process = true;
- msg = "鎭枩浣狅紒杩斿埄璁㈠崟杈惧埌 " + limitZiGou + "绗�";
+ type = Constant.TYPE_REBATE;
+ targetNum1 = limitZiGou;
} else if (countShare >= limitShare) {
process = true;
- msg = "鎭枩浣狅紒鍒嗕韩璁㈠崟杈惧埌 " + limitShare + "绗�";
+ type = Constant.TYPE_SHAER;
+ targetNum1 = limitShare;
} else if (firstTeam >= limitFirst && secondTeam >= limitSecond) {
process = true;
- msg = "鐩存帴绮変笣杈惧埌" + limitFirst + "浜猴紝闂存帴绮変笣杈惧埌 " + limitSecond + "浜�";
+ targetNum1 = limitFirst;
+ targetNum2 = limitSecond;
}
if (process) {
@@ -257,16 +284,20 @@
info.setUpdateTime(new Date());
addUserVIPPreInfo(info);
- // 娑堟伅
- MsgAccountVipDTO msgDto = new MsgAccountVipDTO();
- msgDto.setStatus("绯荤粺宸插皢浣犵殑璐︽埛鐢卞揩鐪佽揪浜哄崌绾т负鏅�氫細鍛�");
- msgDto.setEquity("浠庢敹鍒版湰娑堟伅璧凤紝浣犲皢鑾峰緱鍏ㄩ儴鏅�氫細鍛樻潈鐩�");
- msgAccountDetailService.addMsgVIP(uid, msg, "濡傛湁鐤戦棶璇疯仈绯绘垜鐨�-浜哄伐瀹㈡湇", msgDto);
-
+ // 鍗囩骇娑堟伅
+ Date registerTime = new Date(1577836800000L);
+ UserInfoRegister userInfoRegister = userInfoRegisterService.selectByPrimaryKey(uid);
+ if (userInfoRegister != null && userInfoRegister.getCreateTime() != null) {
+ registerTime = userInfoRegister.getCreateTime();
+ }
+ int daysBetween = DateUtil.daysBetween(registerTime, new Date());
+ userAccountMsgNotificationService.vipPreUpgrade(uid, "蹇渷杈句汉", "鏅�氫細鍛�", daysBetween, targetNum1, targetNum2, type);
// 璧犻�侀噾甯�
String goldcoin = userVipConfigService.getValueByKey("vip_pre_3_gift_goldcoin");
if (!StringUtil.isNullOrEmpty(goldcoin)) {
+
+ int goldcoinNum = Integer.parseInt(goldcoin);
// 娣诲姞閲戝竵鏄庣粏
IntegralDetail detail = new IntegralDetail();
detail.setTitle("鍗囩骇VIP绂忓埄");
@@ -279,7 +310,15 @@
// 娣诲姞閲戝竵
userInfoExtraService.addGoldCoinByUid(uid, Integer.parseInt(goldcoin));
- //TODO 娑堟伅
+ // 娑堟伅
+ List<CommonMsgItemVO> listMsg = new ArrayList<>();
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鐘� 鎬�", ClientTextStyleVO.COLOR_TITLE),
+ new ClientTextStyleVO("鎭枩浣狅紒鎴愬姛鍗囩骇涓烘櫘閫氫細鍛�", ClientTextStyleVO.COLOR_CONTENT)));
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("濂� 鍔�", ClientTextStyleVO.COLOR_TITLE),
+ new ClientTextStyleVO("鑾峰緱閲戝竵" + goldcoinNum+"鏋�", ClientTextStyleVO.COLOR_CONTENT)));
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("澶� 娉�", ClientTextStyleVO.COLOR_TITLE),
+ new ClientTextStyleVO("璇︽儏鏌ョ湅锛屽搴斾細鍛樻潈鐩�", ClientTextStyleVO.COLOR_CONTENT)));
+ userOtherMsgNotificationService.createMsgOtherDetail(uid, listMsg, MsgTypeOtherTypeEnum.vipUpgradeReward);
}
// 鏄惁瀛樺湪涓嬬骇鑴辩鏈熼檺 -鏇存柊涓嶈劚绂�
@@ -302,7 +341,13 @@
if (threeSale == null)
return;
+ // 楠岃瘉涓婄骇鏄惁姝ｅ父
Long bossId = threeSale.getBoss().getId();
+ UserInfo userInfo = userInfoService.getUserById(bossId);
+ if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {
+ return;
+ }
+
// 楠岃瘉涓婄骇鏄惁宸叉槸浼氬憳
UserVIPPreInfo oldInfo = userVIPPreInfoMapper.selectByUidAndProcess(bossId, UserVIPPreInfo.PROCESS_1);
if (oldInfo != null) {
@@ -311,9 +356,6 @@
// 娣诲姞鑴辩鍏崇郴鍊掕鏃�
userInviteSeparateService.addPreSeparateRecord(uid, bossId);
-
- // TODO 娑堟伅
-
}
@@ -329,9 +371,6 @@
*/
@Transactional(rollbackFor = Exception.class)
private boolean twoProcess(Long uid, long countZiGou, long countShare, long firstTeam, long secondTeam) {
- boolean process = false;
- String msg = "";
-
long limitZiGou = 0;
String zigou = userVipConfigService.getValueByKey("vip_pre_7_zigou_order_count");
if (!StringUtil.isNullOrEmpty(zigou)) {
@@ -356,15 +395,22 @@
limitSecond = Long.parseLong(second);
}
+ Integer type = null;
+ long targetNum1 = 0L;
+ Long targetNum2 = 0L;
+ boolean process = false;
if (countZiGou >= limitZiGou) {
process = true;
- msg = "鎭枩浣狅紒杩斿埄璁㈠崟杈惧埌 " + limitZiGou + "绗�";
+ targetNum1 = limitZiGou;
+ type = Constant.TYPE_REBATE;
} else if (countShare >= limitShare) {
process = true;
- msg = "鎭枩浣狅紒鍒嗕韩璁㈠崟杈惧埌 " + limitShare + "绗�";
+ targetNum1 = limitShare;
+ type = Constant.TYPE_SHAER;
} else if (firstTeam >= limitFirst && secondTeam >= limitSecond) {
process = true;
- msg = "鐩存帴绮変笣杈惧埌" + limitFirst + "浜猴紝闂存帴绮変笣杈惧埌 " + limitSecond + "浜�";
+ targetNum1 = limitFirst;
+ targetNum2 = limitSecond;
}
if (process) {
@@ -375,12 +421,11 @@
info.setCreateTime(new Date());
info.setUpdateTime(new Date());
addUserVIPPreInfo(info);
-
- // 娑堟伅
- MsgAccountVipDTO msgDto = new MsgAccountVipDTO();
- msgDto.setStatus("绯荤粺宸插皢浣犵殑璐︽埛鐢辨櫘閫氫細鍛樺崌绾т负楂樼骇浼氬憳");
- msgDto.setEquity("浠庢敹鍒版湰娑堟伅璧凤紝浣犲皢鑾峰緱鍏ㄩ儴楂樼骇浼氬憳鏉冪泭");
- msgAccountDetailService.addMsgVIP(uid, msg, "濡傛湁鐤戦棶璇疯仈绯绘垜鐨�-浜哄伐瀹㈡湇", msgDto);
+
+ // 鍗囩骇娑堟伅
+ UserVIPPreInfo pre1 = userVIPPreInfoMapper.selectByUidAndProcess(uid, UserVIPPreInfo.PROCESS_1);
+ int daysBetween = DateUtil.daysBetween(pre1.getCreateTime(), new Date());
+ userAccountMsgNotificationService.vipPreUpgrade(uid, "鏅�氫細鍛�", "楂樼骇浼氬憳", daysBetween, targetNum1, targetNum2, type);
// 璧犻�佸鍔卞埜
String rewardCoupon = userVipConfigService.getValueByKey("vip_pre_7_gift_reward_coupon");
@@ -391,10 +436,16 @@
userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.rebatePercentCoupon.name(),
UserSystemCoupon.SOURCE_SYSTEM_PUSH, percent, false);
}
+
+ List<CommonMsgItemVO> listMsg = new ArrayList<>();
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鐘� 鎬�", ClientTextStyleVO.COLOR_TITLE),
+ new ClientTextStyleVO("鎭枩浣狅紒鎴愬姛鍗囩骇涓洪珮绾т細鍛�", ClientTextStyleVO.COLOR_CONTENT)));
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("濂� 鍔�", ClientTextStyleVO.COLOR_TITLE),
+ new ClientTextStyleVO("鑾峰緱杩斿埄濂栧姳鍒�" + num +"寮�", ClientTextStyleVO.COLOR_CONTENT)));
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("澶� 娉�", ClientTextStyleVO.COLOR_TITLE),
+ new ClientTextStyleVO("璇︽儏鏌ョ湅锛屽搴斾細鍛樻潈鐩�", ClientTextStyleVO.COLOR_CONTENT)));
+ userOtherMsgNotificationService.createMsgOtherDetail(uid, listMsg, MsgTypeOtherTypeEnum.vipUpgradeReward);
}
-
- // TODO 鍙戝埜娑堟伅
-
} catch (Exception e) {
e.printStackTrace();
LogHelper.error(e);
--
Gitblit v1.8.0