Merge remote-tracking branch 'origin/div' into div

yujian

2020-05-11 712fb305d6f79961e879a2f543107e19d7f9e8a2

 fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/SyncBeforeInfoMessageListener.java

@@ -115,6 +115,13 @@
               if (vipInfo == null) {// 没有生成高级及以上会员

                  UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);

                  if (extra != null && !StringUtil.isNullOrEmpty(extra.getInviteCode())) {



                     List<Long> uids = new ArrayList<>();

                     uids.add(uid);

                     List<UserInfoRegister> list = userInfoRegisterService.listByMultipleUids(uids);

                     if (list != null && list.size() > 0)// 有注册信息

                     {

                        if (list.get(0).getCreateTime().getTime() < Constant.NEW_ORDER_FANLI_RULE_TIME) {// 增加注册时间限制

                     // 老用户生成普通会员

                     UserVIPPreInfo vip = new UserVIPPreInfo();

                     vip.setCreateTime(new Date());

@@ -129,6 +136,8 @@
                  }

               }

            }

               }

            }

         } else if (log != null && VersionUtil.greaterThan_2_1(

               "appstore".equalsIgnoreCase(log.getChannel()) ? "ios" : "android", log.getVersionCode())) {// 2.1后升级其他等级

            // 线上老用户升级到2.1，自动计算等级