Administrator
3 days ago 4dccd9bc880232208a6eb4af5327c9c95e4db643
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -331,6 +331,8 @@
        List<HappyMemberLabelRecord> happyMemberLabelRecords = happyMemberLabelRecordMapper.selectList(
                new LambdaQueryWrapper<HappyMemberLabelRecord>()
                        .eq(HappyMemberLabelRecord::getMemberId, id)
                        .orderByDesc(HappyMemberLabelRecord::getId)
                .last("limit 5")
        );
        if(CollUtil.isNotEmpty(happyMemberLabelRecords)){
            Set<Long> collect = happyMemberLabelRecords.stream().map(HappyMemberLabelRecord::getLabelId).collect(Collectors.toSet());
@@ -1733,12 +1735,14 @@
            Set<Long> collect = happyMemberLabelRecords.stream().map(HappyMemberLabelRecord::getLabelId).collect(Collectors.toSet());
            List<HappyMemberLabel> happyMemberLabels = happyMemberLabelMapper.selectList(
                    new LambdaQueryWrapper<HappyMemberLabel>()
                            .select(HappyMemberLabel::getIconPng)
                            .select( HappyMemberLabel::getId, HappyMemberLabel::getCode,HappyMemberLabel::getIconPng, HappyMemberLabel::getName, HappyMemberLabel::getContent, HappyMemberLabel::getHeaderPng)
                            .in(HappyMemberLabel::getId, collect)
            );
            if(CollUtil.isNotEmpty(happyMemberLabels)){
                for (HappyMemberLabel happyMemberLabel : happyMemberLabels) {
                    ApiMemberLabelVo apiMemberLabelVo = new ApiMemberLabelVo();
                    apiMemberLabelVo.setId(happyMemberLabel.getId());
                    apiMemberLabelVo.setCode(happyMemberLabel.getCode());
                    apiMemberLabelVo.setName(happyMemberLabel.getName());
                    apiMemberLabelVo.setContent(happyMemberLabel.getContent());
                    apiMemberLabelVo.setHeaderPng(happyMemberLabel.getHeaderPng());