From d5c2554ebae75afbff31c3c2966cc3a747ba941c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 27 四月 2020 15:00:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java
index ba58d09..0825bf6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java
+++ b/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;
--
Gitblit v1.8.0