fanli/src/main/java/com/yeshi/fanli/mapping/user/vip/TeamUserLevelStatisticMapper.xml
@@ -41,6 +41,22 @@ from yeshi_ec_team_user_level_statistic where tuls_uid = #{id,jdbcType=BIGINT} </select> <select id="listByUids" resultMap="BaseResultMap"> select <include refid="Base_Column_List" /> from yeshi_ec_team_user_level_statistic where <foreach collection="uidList" open="(" separator=" or " close=")" item="uid"> tuls_uid =#{uid} </foreach> </select> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_team_user_level_statistic where tuls_uid = #{id,jdbcType=BIGINT} fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMoneyComputeServiceImpl.java
@@ -187,9 +187,9 @@ return null; if (buyerLevel == UserLevelEnum.daRen && boss.getLevel() == UserLevelEnum.daRen) { rate = new BigDecimal(9); rate = hongBaoManageService.getByKeyAndMaxTime("new_invite_daren_6", date.getTime()); } else if (buyerLevel == UserLevelEnum.normalVIP && boss.getLevel() == UserLevelEnum.normalVIP) { rate = new BigDecimal(9); rate = hongBaoManageService.getByKeyAndMaxTime("new_invite_daren_6", date.getTime()); } else { BigDecimal bossRate = getRateByLevel(boss.getLevel(), date); BigDecimal buyerRate = getRateByLevel(buyerLevel, date); @@ -212,13 +212,13 @@ BigDecimal rate = null; if (buyerLevel == UserLevelEnum.daRen && firstBoss.getLevel() == UserLevelEnum.daRen) { if (boss.getLevel() == UserLevelEnum.daRen) rate = new BigDecimal(1); rate = hongBaoManageService.getByKeyAndMaxTime("new_invite_daren_7", date.getTime()); else { rate = null; } } else if (buyerLevel == UserLevelEnum.normalVIP && firstBoss.getLevel() == UserLevelEnum.normalVIP) { if (boss.getLevel() == UserLevelEnum.normalVIP) rate = new BigDecimal(1); rate = hongBaoManageService.getByKeyAndMaxTime("new_invite_daren_7", date.getTime()); else { rate = null; } @@ -299,8 +299,10 @@ highList = highList.subList(0, 4); } BigDecimal highTotalRate = new BigDecimal("0.9"); BigDecimal vipTotalRate = new BigDecimal("1.5"); BigDecimal highTotalRate = hongBaoManageService.getByKeyAndMaxTime("dividents_rate_same_level_high", date.getTime()); BigDecimal vipTotalRate = hongBaoManageService.getByKeyAndMaxTime("dividents_rate_same_level_super", date.getTime()); if (vipList.size() > 0 && highList.size() > 0) { @@ -343,7 +345,8 @@ // 导师分红 for (UserTeamLevel level : bossLevelList) { if (level.getLevel() == UserLevelEnum.tearcher) { rateList.add(new UserTeamRate(level, new BigDecimal("0.6"))); rateList.add(new UserTeamRate(level, hongBaoManageService.getByKeyAndMaxTime("dividents_rate_tearcher", date.getTime()))); break; } } fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/TeamUserLevelStatisticServiceImpl.java
@@ -58,7 +58,7 @@ } } return null; return resultList; } @Override fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java
@@ -334,7 +334,7 @@ // 获取子红包 List<HongBaoV2> children = hongBaoV2Mapper.listChildrenById(hongBao.getId()); if (children != null && children.size() > 0) { List<UserTeamLevel> bossList = getBossList(hongBao.getUserInfo().getId(), 2); List<UserTeamLevel> bossList = getBossList(oldHongBao.getUserInfo().getId(), 2); for (HongBaoV2 child : children) { if (child.getState() == HongBaoV2.STATE_YILINGQU) @@ -381,7 +381,7 @@ } if (boss != null) { List<UserTeamLevel> bossList = getBossList(hongBao.getUserInfo().getId(), 2); List<UserTeamLevel> bossList = getBossList(oldHongBao.getUserInfo().getId(), 2); // 插入一级子红包 money = orderHongBaoMoneyComputeService.computeFirstInviteMoney(commonOrder, buyerLevel, @@ -440,7 +440,7 @@ // 获取子红包 List<HongBaoV2> children = hongBaoV2Mapper.listChildrenById(hongBao.getId()); if (children != null && children.size() > 0) { List<UserTeamLevel> bossList = getBossList(hongBao.getUserInfo().getId(), 2); List<UserTeamLevel> bossList = getBossList(oldHongBao.getUserInfo().getId(), 2); for (HongBaoV2 child : children) { if (child.getState() == HongBaoV2.STATE_YILINGQU) continue; fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/OrderDividentsMessageListener.java
@@ -27,7 +27,6 @@ import com.yeshi.fanli.exception.order.dividents.TeamDividentsSourceOrderException; import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.service.inter.order.CommonOrderService; import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceOrderService; 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; fanli/src/main/java/com/yeshi/fanli/util/user/UserLevelUtil.java
@@ -22,8 +22,7 @@ } return null; } /** * 根据枚举名称匹配 * @param level @@ -39,8 +38,6 @@ } return null; } /** * 根据等级数字 @@ -141,4 +138,20 @@ return UserLevelEnum.superVIP; return userLevel; } /** * 获取外显等级 * @Title: getShowLevel * @Description: * @param userLevel * @return * UserLevelEnum 返回类型 * @throws */ public static UserLevelEnum getShowLevel(UserLevelEnum userLevel) { if (userLevel == UserLevelEnum.normalVIP) return UserLevelEnum.daRen; return userLevel; } }
