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

yujian

2020-05-06 a4637ae9d71aa4a624b217ed3a1483f0e3a3a7ed

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

@@ -80,10 +80,9 @@
         if (tag.equalsIgnoreCase(UserTopicTagEnum.userActve.name())) {

            UserActiveMQMsg msg = new Gson().fromJson(new String(message.getBody()), UserActiveMQMsg.class);

            Long uid = msg.getUid();



            // 老用户同步绑定信息

				
            userInfoModifyRecordService.syncBeforeInfo(uid);



            // 低版本全部升级普通会员



            List<ThreeSale> threeSaleList = threeSaleSerivce.getMyBossDeepList(uid, 2);

@@ -121,6 +120,7 @@
                     vip.setCreateTime(new Date());

                     vip.setProcess(UserVIPPreInfo.PROCESS_1);

                     vip.setUid(uid);

                     vip.setSourceType(UserVIPPreInfo.SOURCE_TYPE_ORDER);

                     try {

                        userVIPPreInfoService.addUserVIPPreInfo(vip);

                     } catch (UserVIPPreInfoException e) {

@@ -153,6 +153,7 @@
                           vip.setCreateTime(new Date());

                           vip.setProcess(UserVIPPreInfo.PROCESS_1);

                           vip.setUid(uid);

                           vip.setSourceType(UserVIPPreInfo.SOURCE_TYPE_ORDER);

                           try {

                              userVIPPreInfoService.addUserVIPPreInfo(vip);

                           } catch (UserVIPPreInfoException e) {