fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
@@ -23,7 +23,6 @@ import com.aliyun.openservices.ons.api.Producer; import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum; import com.yeshi.fanli.dto.mq.user.body.UserActiveMQMsg; import com.yeshi.fanli.entity.bus.user.UserInfoExtra; import com.yeshi.fanli.service.inter.user.UserInfoExtraService; import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService; import com.yeshi.fanli.service.inter.user.integral.IntegralGetService; @@ -102,12 +101,13 @@ if (!StringUtil.isNullOrEmpty(jedis.set(key, "1", new SetParams().nx().ex(300)))) { try { Long uid = Long.parseLong(uidStr); if (!Constant.IS_TEST) { // 活跃通知 // if (!Constant.IS_TEST) { // 活跃通知 UserActiveMQMsg msg = new UserActiveMQMsg(uid, new Date()); Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.userActve, msg); producer.send(message); } // } } catch (Exception e) { } } } finally { fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
@@ -255,7 +255,7 @@ System.out.println(st); contentDecode = st; contentDecode = contentDecode.substring(contentDecode.indexOf("mtopjsonp1(") + "mtopjsonp1(".length(), contentDecode = contentDecode.substring(contentDecode.indexOf("(") +1, contentDecode.length()).trim(); if (contentDecode.endsWith(")")) contentDecode = contentDecode.substring(0, contentDecode.length() - 1); fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
@@ -102,11 +102,10 @@ @Resource private UserInfoService userInfoService; @Resource private UserVIPInfoService userVIPInfoService; @Resource private UserVIPPreInfoService userVIPPreInfoService; @@ -115,10 +114,9 @@ @Resource private ThreeSaleSerivce threeSaleSerivce; @Resource private UserVipConfigService userVipConfigService; /** * s 首页配置信息 @@ -371,19 +369,19 @@ data.put("tearcherLink", tearcherLink); } } if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) { // TODO 验证是否是导师 UserVIPPreInfo info = userVIPPreInfoService.getLatestProcessInfo(uid); JSONObject inner = new JSONObject(); inner.put("link", userVipConfigService.getValueByKey("vip_link")); inner.put("ion", "http://img.flqapp.com/resource/vip/icon_vip.png"); inner.put("title", "免费升级 享会员权益"); inner.put("btnName", "升级会员"); if (uid != null) { // 是否导师 TODO if (userVIPInfoService.isVIP(uid)) { if (info!=null&&info.getProcess()==UserVIPPreInfo.PROCESS_3) { inner.put("link", userVipConfigService.getValueByKey("vip_link")); inner.put("ion", "http://img.flqapp.com/resource/vip/icon_tearcher.png"); inner.put("title", "拿五险与津贴 享导师权益"); @@ -400,10 +398,10 @@ } } data.put("vip", inner); //平台规则 // 平台规则 String platformRuleLink = configService.get(ConfigKeyEnum.platformRule.getKey()); data.put("platformRule", platformRuleLink); } } if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()) && uid != null) { UserLevelUpgradedNotify notify = userLevelUpgradedNotifyService.getNeedNotifyByUid(uid); @@ -429,9 +427,6 @@ e.printStackTrace(); } } // 获取升级时间 private Date getUpgradedTime(Long uid, UserLevelEnum level) { fanli/src/main/java/com/yeshi/fanli/entity/bus/user/vip/UserVIPPreInfo.java
@@ -13,9 +13,10 @@ */ @Table("yeshi_ec_user_vip_pre_info") public class UserVIPPreInfo { public static int PROCESS_1 = 3;// 超级会员第一阶段 public static int PROCESS_2 = 7;// 超级会员第二阶段 public static int PROCESS_4 = 11;// 超级会员第四阶段 public static int PROCESS_1 = 3;// 会员第一阶段 public static int PROCESS_2 = 7;// 会员第二阶段 public static int PROCESS_3 = 10;// 会员第三阶段 public static int PROCESS_4 = 11;// 会员第四阶段 @Column(name = "vpi_id") private Long id;
