From 64db0aaa8d834262a416321050770d44eaf34e0d Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Wed, 07 Aug 2024 10:34:31 +0800 Subject: [PATCH] 后台 --- src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java index 08bbf83..d217c24 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java @@ -1963,6 +1963,7 @@ QueryWrapper<MallProductBuy> query = new QueryWrapper<>(); query.eq("state",ProductEnum.PRODUCT_BUY_SUCCESS.getValue()); query.eq("mate_state",ProductEnum.PRODUCT_BUY_MATE_STATE_FAIL.getValue()); + query.orderByAsc("CREATED_TIME"); List<MallProductBuy> mallProductBuys = mallProductBuyMapper.selectList(query); if(CollUtil.isEmpty(mallProductBuys)){ return; @@ -2033,7 +2034,8 @@ mallMembersAll = memberMapper.selectMemberWithLevelAndMemberId(levelType,mallMemberRef.getInviteId()); } - Collection<MallMember> intersection1 = CollUtil.intersection(mallMembersAll, mallMembers); + Set<Long> collectAll = mallMembersAll.stream().map(MallMember::getId).collect(Collectors.toSet()); + Collection<Long> intersection1 = CollUtil.intersection(collectAll, collect); if(teamCnt <= (CollUtil.isEmpty(intersection1) ? 0 : intersection1.size())){ mallMemberRef.setLevel(level); memberMapper.updateById(mallMemberRef); -- Gitblit v1.9.1