fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
@@ -371,9 +371,7 @@ } 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"); @@ -381,11 +379,14 @@ inner.put("btnName", "升级会员"); if (uid != null) { if (info!=null&&info.getProcess()==UserVIPPreInfo.PROCESS_3) { 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", "拿五险与津贴 享导师权益"); inner.put("btnName", "升级导师"); if (info.getProcess() == UserVIPPreInfo.PROCESS_4) inner.put("btnName", "板栗快省"); else inner.put("btnName", "升级导师"); } else { UserVIPPreInfo userVIPPreInfo = userVIPPreInfoService.getLatestProcessInfo(uid); if (userVIPPreInfo != null) { fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SystemClientController.java
@@ -30,6 +30,7 @@ import com.yeshi.fanli.service.inter.push.IOSPushService; import com.yeshi.fanli.service.inter.user.UserInfoExtraService; import com.yeshi.fanli.util.ThreadUtil; import com.yeshi.fanli.util.annotation.UserActive; import net.sf.json.JSONObject; @@ -58,6 +59,7 @@ @Resource private UserInfoExtraService userInfoExtraService; @UserActive(uid="#uid") @RequestMapping("getsystemclientparams") public void getSystemClientParams(AcceptData acceptData, Long uid, String mac, HttpServletRequest request, PrintWriter out) { fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java
@@ -25,7 +25,6 @@ import com.yeshi.fanli.entity.bus.user.HongBaoV2; import com.yeshi.fanli.entity.bus.user.ThreeSale; import com.yeshi.fanli.entity.bus.user.UserInfo; import com.yeshi.fanli.entity.bus.user.vip.TeamUserLevelStatistic; import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum; import com.yeshi.fanli.entity.order.CommonOrder; import com.yeshi.fanli.entity.order.CommonOrderGoods; @@ -43,7 +42,6 @@ import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService; import com.yeshi.fanli.service.inter.user.UserSystemCouponService; 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.UserVIPInfoService; import com.yeshi.fanli.service.manger.user.UserLevelManager; import com.yeshi.fanli.util.Constant; @@ -96,9 +94,6 @@ @Resource private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService; @Resource private TeamUserLevelStatisticService teamUserLevelStatisticService; /** * 添加红包信息 @@ -247,11 +242,12 @@ List<Long> uidList = new ArrayList<Long>(); for (ThreeSale ts : threeSales) uidList.add(ts.getBoss().getId()); List<TeamUserLevelStatistic> levelList = teamUserLevelStatisticService.listByUids(uidList); if (levelList != null) for (TeamUserLevelStatistic s : levelList) { resultList.add(new UserTeamLevel(s.getId(), s.getLevel())); } for (Long bossUid : uidList) { UserLevelEnum level = userLevelManager.getUserLevel(bossUid); resultList.add(new UserTeamLevel(bossUid, level)); } } return resultList; @@ -351,7 +347,7 @@ // 获取子红包 List<HongBaoV2> children = hongBaoV2Mapper.listChildrenById(hongBao.getId()); if (children != null && children.size() > 0) { List<UserTeamLevel> bossList =getBossList(children); List<UserTeamLevel> bossList = getBossList(children); for (HongBaoV2 child : children) { if (child.getState() == HongBaoV2.STATE_YILINGQU) @@ -457,7 +453,7 @@ // 获取子红包 List<HongBaoV2> children = hongBaoV2Mapper.listChildrenById(hongBao.getId()); if (children != null && children.size() > 0) { List<UserTeamLevel> bossList =getBossList(children); List<UserTeamLevel> bossList = getBossList(children); for (HongBaoV2 child : children) { if (child.getState() == HongBaoV2.STATE_YILINGQU) continue; fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -27,6 +27,9 @@ public static boolean ENABLE_MQ = false; public static int PAGE_SIZE = 20; // 新的规则生效时间 public static final long NEW_ORDER_FANLI_RULE_TIME = TimeUtil.convertToTimeTemp("2020-04-14", "yyyy-MM-dd"); // 验证文本口令或链接uid public static Long LINK_TOKEN_VERIFY_UID = 437032L; @@ -256,8 +259,6 @@ public static final WXAPPInfo WXMP_APP_INFO = new WXAPPInfo("wxc22f3bd53cb25012", "4c7b166fecb6d9f53837e993f2214673", "", ""); // 新的规则生效时间 public static final long NEW_ORDER_FANLI_RULE_TIME = TimeUtil.convertToTimeTemp("2020-04-14", "yyyy-MM-dd"); // 使用奖励券最大金额限制 public static final BigDecimal REWARD_COUPON_LIMIT_MONEY = new BigDecimal("10"); fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/OrderDividentsMessageListener.java
@@ -20,7 +20,7 @@ import com.yeshi.fanli.dto.mq.user.body.UserForbiddenMQMsg; import com.yeshi.fanli.dto.order.UserTeamLevel; import com.yeshi.fanli.entity.bus.user.ThreeSale; import com.yeshi.fanli.entity.bus.user.vip.TeamUserLevelStatistic; import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum; import com.yeshi.fanli.entity.order.CommonOrder; import com.yeshi.fanli.exception.ParamsException; import com.yeshi.fanli.exception.money.TeamDividentsDebtException; @@ -28,9 +28,9 @@ import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.service.inter.order.CommonOrderService; import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce; import com.yeshi.fanli.service.inter.user.vip.TeamUserLevelStatisticService; import com.yeshi.fanli.service.manger.order.TeamDividentsManager; import com.yeshi.fanli.service.manger.order.TeamDividentsSourceManager; import com.yeshi.fanli.service.manger.user.UserLevelManager; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.order.CommonOrderUtil; import com.yeshi.fanli.util.rocketmq.MQTopicName; @@ -56,7 +56,7 @@ private ThreeSaleSerivce threeSaleSerivce; @Resource private TeamUserLevelStatisticService teamUserLevelStatisticService; private UserLevelManager userLevelManager; public OrderDividentsMessageListener() { @@ -97,13 +97,8 @@ List<ThreeSale> threeSalesList = threeSaleSerivce.getMyBossDeepList(dto.getUid(), 100); if (threeSalesList != null) for (ThreeSale ts : threeSalesList) { TeamUserLevelStatistic levelStatistic = teamUserLevelStatisticService .selectByUid(ts.getBoss().getId()); if (levelStatistic == null) { teamUserLevelStatisticService.initData(ts.getBoss().getId()); levelStatistic = teamUserLevelStatisticService.selectByUid(ts.getBoss().getId()); } bossList.add(new UserTeamLevel(ts.getBoss().getId(), levelStatistic.getLevel())); UserLevelEnum level = userLevelManager.getUserLevel(ts.getBoss().getId()); bossList.add(new UserTeamLevel(ts.getBoss().getId(), level)); } try { teamDividentsSourceManager.addSource(commonOrderList, bossList);
