fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java
@@ -665,6 +665,11 @@ private void addInviteHongBao(HongBaoV2 child, String parentHongBaoUserName, Map<Integer, HongBaoOrder> notificationMap, CommonOrder commonOrder) { if (child != null) { //老版本资金为0的红包不加入邀请订单 if (child.getMoney() == null || (child.getMoney().compareTo(new BigDecimal(0)) == 0 && commonOrder.getThirdCreateTime().getTime() < Constant.NEW_ORDER_FANLI_RULE_TIME)) return; hongBaoV2Mapper.insertSelective(child); // 用户通知 if (notificationMap.get(child.getType()) == null) { fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/SyncBeforeInfoMessageListener.java
@@ -15,6 +15,7 @@ import com.google.gson.Gson; import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum; import com.yeshi.fanli.dto.mq.user.body.UserActiveMQMsg; import com.yeshi.fanli.entity.bus.user.ThreeSale; import com.yeshi.fanli.entity.bus.user.UserActiveLog; import com.yeshi.fanli.entity.bus.user.UserInfoExtra; import com.yeshi.fanli.entity.bus.user.UserInfoRegister; @@ -25,6 +26,7 @@ import com.yeshi.fanli.service.inter.user.UserInfoExtraService; import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService; import com.yeshi.fanli.service.inter.user.UserInfoRegisterService; import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce; import com.yeshi.fanli.service.inter.user.vip.TeamUserLevelStatisticService; import com.yeshi.fanli.service.inter.user.vip.UserVIPPreInfoService; import com.yeshi.fanli.util.Constant; @@ -59,6 +61,9 @@ @Resource private UserInfoExtraService userInfoExtraService; @Resource private ThreeSaleSerivce threeSaleSerivce; @Override public Action consume(Message message, ConsumeContext context) { @@ -78,12 +83,33 @@ // 老用户同步绑定信息 userInfoModifyRecordService.syncBeforeInfo(uid); // 低版本全部升级普通会员 List<ThreeSale> threeSaleList = threeSaleSerivce.getMyBossDeepList(uid, 2); List<Long> uidList = new ArrayList<>(); uidList.add(uid); if (threeSaleList != null) { for (ThreeSale ts : threeSaleList) { uidList.add(ts.getBoss().getId()); } } upgradeOldUser(uidList); } } return Action.CommitMessage; } private void upgradeOldUser(List<Long> uidList) { for (Long uid : uidList) { // 同步老用户等级 UserActiveLog log = userActiveLogService.getUserLatestActiveInfo(uid); // 低版本全部升级普通会员 if (log != null && !VersionUtil.greaterThan_2_1( "appstore".equalsIgnoreCase(log.getChannel()) ? "ios" : "android", log.getVersionCode())) { if (log != null && !VersionUtil.greaterThan_2_1("appstore".equalsIgnoreCase(log.getChannel()) ? "ios" : "android", log.getVersionCode())) { UserVIPPreInfo vipInfo = userVIPPreInfoService.getLatestProcessInfo(uid); if (vipInfo == null) { vipInfo = userVIPPreInfoService.getLatestProcessInfo(uid); @@ -103,7 +129,6 @@ } } } } else if (log != null && VersionUtil.greaterThan_2_1( "appstore".equalsIgnoreCase(log.getChannel()) ? "ios" : "android", log.getVersionCode())) {// 2.1后升级其他等级 // 线上老用户升级到2.1，自动计算等级 @@ -139,9 +164,6 @@ } } } } } return Action.CommitMessage; } } fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/UserVIPMessageListener.java
@@ -15,13 +15,16 @@ import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum; import com.yeshi.fanli.dto.mq.user.body.ThreeSaleSeparateMQMsg; import com.yeshi.fanli.dto.mq.user.body.UserLevelChangedMQMsg; import com.yeshi.fanli.entity.bus.user.UserActiveLog; import com.yeshi.fanli.entity.bus.user.UserInfo; import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.service.inter.user.UserActiveLogService; 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.vip.TeamUserLevelStatisticService; import com.yeshi.fanli.service.inter.user.vip.UserVIPPreInfoService; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.VersionUtil; import com.yeshi.fanli.util.rocketmq.MQTopicName; /** @@ -44,6 +47,9 @@ @Resource private UserInviteValidNumService userInviteValidNumService; @Resource private UserActiveLogService userActiveLogService; @Override public Action consume(Message message, ConsumeContext context) { @@ -92,6 +98,14 @@ OrderMoneyRecievedMQMsg dto = new Gson().fromJson(new String(message.getBody()), OrderMoneyRecievedMQMsg.class); if (dto != null) { // 判断版本 UserActiveLog log = userActiveLogService.getUserLatestActiveInfo(dto.getUid()); if (log == null || !VersionUtil.greaterThan_2_1( "appstore".equalsIgnoreCase(log.getChannel()) ? "ios" : "android", log.getVersionCode())) { return Action.CommitMessage; } if (dto.getType() == OrderMoneyRecievedMQMsg.TYPE_ZIGOU) {// 自购到账 // 会员升级-自购订单数量验证 userVIPPreInfoService.upgradeVipByMyOrder(dto.getUid()); @@ -105,7 +119,8 @@ if (dto != null) { // 会员等级升级-粉丝数量验证 userVIPPreInfoService.upgradeVipByTeamNum(dto.getSourceUid()); userInviteValidNumService.addValidTeamNum(dto.getSourceUid(), dto.getSettleMent(), dto.getPlaceOrderTime()); userInviteValidNumService.addValidTeamNum(dto.getSourceUid(), dto.getSettleMent(), dto.getPlaceOrderTime()); } } }
