From 469bba3a544b3beef0c170f6fce5804c9e8a9676 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期五, 10 四月 2020 17:02:51 +0800 Subject: [PATCH] 消息 --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java | 84 ++++++++++++++++++++++++----------------- 1 files changed, 49 insertions(+), 35 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 d8006e2..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 @@ -12,13 +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; @@ -31,13 +32,14 @@ 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; @@ -59,9 +61,6 @@ @Resource private ThreeSaleSerivce threeSaleSerivce; - @Resource - private MsgAccountDetailService msgAccountDetailService; - @Resource private UserVipConfigService userVipConfigService; @@ -89,6 +88,12 @@ @Resource private UserOtherMsgNotificationService userOtherMsgNotificationService; + + @Resource + private UserAccountMsgNotificationService userAccountMsgNotificationService; + + @Resource + private UserInfoRegisterService userInfoRegisterService; @Override @@ -222,15 +227,12 @@ * @param secondTeam */ @Transactional(rollbackFor = Exception.class) - private boolean oneProcess(Long uid, long countZiGou, long countShare, long firstTeam, long secondTeam) { + 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; } - boolean process = false; - String msg = ""; - long limitZiGou = 0; String zigou = userVipConfigService.getValueByKey("vip_pre_3_zigou_order_count"); if (!StringUtil.isNullOrEmpty(zigou)) { @@ -255,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) { @@ -275,12 +284,14 @@ 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"); @@ -360,14 +371,11 @@ */ @Transactional(rollbackFor = Exception.class) private boolean twoProcess(Long uid, long countZiGou, long countShare, long firstTeam, long secondTeam) { - boolean process = false; - String msg = ""; - - long limitZiGou = 10; -// String zigou = userVipConfigService.getValueByKey("vip_pre_7_zigou_order_count"); -// if (!StringUtil.isNullOrEmpty(zigou)) { -// limitZiGou = Long.parseLong(zigou); -// } + long limitZiGou = 0; + String zigou = userVipConfigService.getValueByKey("vip_pre_7_zigou_order_count"); + if (!StringUtil.isNullOrEmpty(zigou)) { + limitZiGou = Long.parseLong(zigou); + } long limitShare = 0; String share = userVipConfigService.getValueByKey("vip_pre_7_share_order_count"); @@ -387,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) { @@ -406,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"); -- Gitblit v1.8.0