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

admin

2020-04-22 d22d18f40d088277195e5c3ab587d07450f1a94d

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java

@@ -388,7 +388,7 @@
         UserLevelUpgradedNotify notify = new UserLevelUpgradedNotify();

         notify.setUid(uid);

         notify.setFromLevel(UserLevelEnum.daRen);

         notify.setToLevel(UserLevelEnum.normalVIP);

//         notify.setToLevel(UserLevelEnum.normalVIP);

         notify.setValid(true);

         notify.setCreateTime(new Date());

         userLevelUpgradedNotifyService.addUserLevelUpgradedNotify(notify);

@@ -401,11 +401,11 @@
         // 提醒上级

         remindBoss(uid, "普通会员", item, upgradeTime, true);

         

         if (!Constant.IS_TEST) {

            UserLevelChangedMQMsg msg = new UserLevelChangedMQMsg(uid, UserLevelEnum.daRen,UserLevelEnum.normalVIP, new Date());

            Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.userLevelChanged, msg);

            producer.send(message);

         }

//         if (!Constant.IS_TEST) {

//            UserLevelChangedMQMsg msg = new UserLevelChangedMQMsg(uid, UserLevelEnum.daRen,UserLevelEnum.normalVIP, new Date());

//            Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.userLevelChanged, msg);

//            producer.send(message);

//         }

      } catch (Exception e) {

         e.printStackTrace();

      }

@@ -445,7 +445,7 @@
         // 升级弹框提示

         UserLevelUpgradedNotify notify = new UserLevelUpgradedNotify();

         notify.setUid(uid);

         notify.setFromLevel(UserLevelEnum.normalVIP);

//         notify.setFromLevel(UserLevelEnum.normalVIP);

         notify.setToLevel(UserLevelEnum.highVIP);

         notify.setValid(true);

         notify.setCreateTime(new Date());

@@ -460,7 +460,7 @@
         }

                  

         // 升级消息

         UserLevelEnum fromLevel = UserLevelEnum.normalVIP;

//         UserLevelEnum fromLevel = UserLevelEnum.normalVIP;

         int daysBetween = 0;

         boolean divorced = false;

         String beforeName = "快省达人";

@@ -480,7 +480,7 @@
            goldcoinReward(uid);

            // 需要发送脱离信息

            divorced = true;

            fromLevel = UserLevelEnum.daRen;

//            fromLevel = UserLevelEnum.daRen;

         }

         userAccountMsgNotificationService.vipPreUpgrade(uid, beforeName, "高级会员", daysBetween, limit1, limit2, type);



@@ -488,11 +488,11 @@
         remindBoss(uid, "高级会员", item, upgradeTime, divorced);

         

         

         if (!Constant.IS_TEST) {

            UserLevelChangedMQMsg msg = new UserLevelChangedMQMsg(uid, fromLevel,UserLevelEnum.highVIP, new Date());

            Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.userLevelChanged, msg);

            producer.send(message);

         }

//         if (!Constant.IS_TEST) {

//            UserLevelChangedMQMsg msg = new UserLevelChangedMQMsg(uid, fromLevel,UserLevelEnum.highVIP, new Date());

//            Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.userLevelChanged, msg);

//            producer.send(message);

//         }

      } catch (Exception e) {

         e.printStackTrace();

         LogHelper.error(e);