From 2ec42a5aacea35d2918f0e17f07685cf5b4d25c8 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 12 五月 2020 20:20:41 +0800 Subject: [PATCH] 包名引用路径更改 --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 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 e5447c2..177ac29 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 @@ -34,6 +34,7 @@ import com.yeshi.fanli.service.inter.user.invite.UserInviteMsgNotificationService; import com.yeshi.fanli.service.inter.user.invite.UserInviteValidNumService; import com.yeshi.fanli.service.inter.user.msg.UserAccountMsgNotificationService; +import com.yeshi.fanli.service.inter.user.vip.TeamUserLevelStatisticService; import com.yeshi.fanli.service.inter.user.vip.UserLevelUpgradedNotifyService; import com.yeshi.fanli.service.inter.user.vip.UserVIPPreInfoService; import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService; @@ -43,6 +44,7 @@ import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService; import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory; import com.yeshi.fanli.util.rocketmq.MQTopicName; +import com.yeshi.fanli.util.user.UserLevelUtil; @Service public class UserVIPPreInfoServiceImpl implements UserVIPPreInfoService { @@ -89,10 +91,17 @@ @Resource(name = "producer") private Producer producer; + @Resource + private TeamUserLevelStatisticService teamUserLevelStatisticService; + @Override public void addUserVIPPreInfo(UserVIPPreInfo info) throws UserVIPPreInfoException { - if (info == null || info.getUid() == null || info.getProcess() == null) + if (info == null || info.getUid() == null || info.getProcess() == null || info.getSourceType() == null) throw new UserVIPPreInfoException(1, "淇℃伅涓嶅畬鏁�"); + for (Long fuid : Constant.NO_UPGRADE_UIDS) {// 绂佹涓嶈兘鍗囩骇鐨勭敤鎴峰崌绾� + if (info.getUid().longValue() == fuid) + return; + } UserVIPPreInfo oldInfo = userVIPPreInfoMapper.selectByUidAndProcess(info.getUid(), info.getProcess()); if (oldInfo != null) @@ -100,6 +109,8 @@ if (info.getCreateTime() == null) info.setCreateTime(new Date()); userVIPPreInfoMapper.insertSelective(info); + // 璁剧疆缁熻鏁版嵁 + teamUserLevelStatisticService.setUserLevel(info.getUid(), UserLevelUtil.getByLevel(info.getProcess())); } @Override @@ -223,7 +234,7 @@ if (!StringUtil.isNullOrEmpty(first7)) { limitFirst7 = Long.parseLong(first7); } - + long limitSecond7 = 0; String second7 = userVipConfigService.getValueByKey("vip_pre_7_second_level_team_count"); if (Constant.IS_TEST) @@ -266,6 +277,11 @@ info.setProcess(UserVIPPreInfo.PROCESS_2); info.setCreateTime(upgradeTime); info.setUpdateTime(upgradeTime); + if (teamPass) + info.setSourceType(UserVIPPreInfo.SOURCE_TYPE_TEAM); + else + info.setSourceType(UserVIPPreInfo.SOURCE_TYPE_ORDER); + addUserVIPPreInfo(info); // 鍗囩骇寮规鎻愮ず @@ -317,4 +333,14 @@ userVIPPreInfoMapper.deleteByPrimaryKey(id); } + @Override + public List<UserVIPPreInfo> listByProcess(int process, Date minTime, Date maxTime, int page, int pageSize) { + return userVIPPreInfoMapper.listByProcess(process, minTime, maxTime, (page - 1) * pageSize, pageSize); + } + + @Override + public long countByProcess(int process, Date minTime, Date maxTime) { + return userVIPPreInfoMapper.countByProcess(process, minTime, maxTime); + } + } -- Gitblit v1.8.0