fix(ai): 修复AI代理列表查询时公司ID为空的问题

Administrator

19 hours ago b012ab5e4fa5a4c7698867d0d9db601be111cc1d

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java

@@ -316,15 +316,15 @@
            }
        }

        HappyMemberLevel happyMemberLevel = happyMemberLevelMapper.selectOne(
                new LambdaQueryWrapper<HappyMemberLevel>()
                        .select(HappyMemberLevel::getName,  HappyMemberLevel::getIconPng)
                        .eq(HappyMemberLevel::getCode, mallMember.getDirector())
        );
        if(happyMemberLevel != null){
            mallMemberVo.setLevelName(happyMemberLevel.getName());
            mallMemberVo.setLevelNamePng(happyMemberLevel.getIconPng());
        }
//        HappyMemberLevel happyMemberLevel = happyMemberLevelMapper.selectOne(
//                new LambdaQueryWrapper<HappyMemberLevel>()
//                        .select(HappyMemberLevel::getName,  HappyMemberLevel::getIconPng)
//                        .eq(HappyMemberLevel::getCode, mallMember.getDirector())
//        );
//        if(happyMemberLevel != null){
//            mallMemberVo.setLevelName(happyMemberLevel.getName());
//            mallMemberVo.setLevelNamePng(happyMemberLevel.getIconPng());
//        }
        if(StrUtil.isNotEmpty(mallMember.getReferrerId())){
            MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
            if (referMember != null) {
@@ -337,64 +337,64 @@
            mallMemberVo.setIsTeamLeader(1);
        }

        if (StrUtil.isNotBlank(mallMember.getTradePassword())) {
            mallMemberVo.setHasTradePwd(1);
        }

        MallMemberPayment payment = mallMemberPaymentMapper.selectByMemberId(id);
        if (payment != null) {
            mallMemberVo.setHasPayment(1);
        }

        MemberCollectionListDto memberCollectionListDto = new MemberCollectionListDto();
        memberCollectionListDto.setPageNow(1);
        memberCollectionListDto.setPageSize(10);
        List<CollectionListVo> collectionList = mallMemberCollectionService.findMemberCollectionList(memberCollectionListDto);
        mallMemberVo.setCollectionCnt(CollUtil.isNotEmpty(collectionList) ? collectionList.size() : 0);

        MemberFootprintListDto memberFootprintListDto = new MemberFootprintListDto();
        memberFootprintListDto.setPageNow(1);
        memberFootprintListDto.setPageSize(10);
        List<FootprintListVo> footprintList = mallMemberFootprintService.findMemberFootprintList(memberFootprintListDto);
        mallMemberVo.setFootprintCnt(CollUtil.isNotEmpty(footprintList) ? footprintList.size() : 0);

        List<MallMember> mallMembers = this.baseMapper.selectByRefererId(mallMember.getInviteId());
        mallMemberVo.setChildCnt(CollUtil.isNotEmpty(mallMembers) ? mallMembers.size() : 0);

        MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());

        MallVipConfig mallVipConfig = mallVipConfigMapper.selectVipConfigByCode(mallMember.getLevel());

        mallMemberVo.setVipInfo(mallVipConfig);
        mallMemberVo.setBalance(wallet.getBalance());
        mallMemberVo.setScore(wallet.getScore());
        mallMemberVo.setPrizeScore(wallet.getPrizeScore());
//        mallMemberVo.setTotalCost(mallOrderInfoMapper.selectTotalAmount(id));

        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());
            List<HappyMemberLabel> happyMemberLabels = happyMemberLabelMapper.selectList(
                    new LambdaQueryWrapper<HappyMemberLabel>()
                            .select(HappyMemberLabel::getIconPng,  HappyMemberLabel::getName)
                            .in(HappyMemberLabel::getId, collect)
            );
            if(CollUtil.isNotEmpty(happyMemberLabels)){
                ArrayList<ApiLabelInfoVo> apiMemberLabelVos = new ArrayList<>();
                for (HappyMemberLabel happyMemberLabel : happyMemberLabels) {
                    ApiLabelInfoVo apiLabelInfoVo = new ApiLabelInfoVo();
                    apiLabelInfoVo.setIconPng(happyMemberLabel.getIconPng());
                    apiLabelInfoVo.setName(happyMemberLabel.getName());
                    apiMemberLabelVos.add(apiLabelInfoVo);
                }
                mallMemberVo.setLabelList(apiMemberLabelVos);
            }
        }
//        if (StrUtil.isNotBlank(mallMember.getTradePassword())) {
//            mallMemberVo.setHasTradePwd(1);
//        }
//
//        MallMemberPayment payment = mallMemberPaymentMapper.selectByMemberId(id);
//        if (payment != null) {
//            mallMemberVo.setHasPayment(1);
//        }
//
//        MemberCollectionListDto memberCollectionListDto = new MemberCollectionListDto();
//        memberCollectionListDto.setPageNow(1);
//        memberCollectionListDto.setPageSize(10);
//        List<CollectionListVo> collectionList = mallMemberCollectionService.findMemberCollectionList(memberCollectionListDto);
//        mallMemberVo.setCollectionCnt(CollUtil.isNotEmpty(collectionList) ? collectionList.size() : 0);
//
//        MemberFootprintListDto memberFootprintListDto = new MemberFootprintListDto();
//        memberFootprintListDto.setPageNow(1);
//        memberFootprintListDto.setPageSize(10);
//        List<FootprintListVo> footprintList = mallMemberFootprintService.findMemberFootprintList(memberFootprintListDto);
//        mallMemberVo.setFootprintCnt(CollUtil.isNotEmpty(footprintList) ? footprintList.size() : 0);
//
//        List<MallMember> mallMembers = this.baseMapper.selectByRefererId(mallMember.getInviteId());
//        mallMemberVo.setChildCnt(CollUtil.isNotEmpty(mallMembers) ? mallMembers.size() : 0);
//
//        MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());
//
//        MallVipConfig mallVipConfig = mallVipConfigMapper.selectVipConfigByCode(mallMember.getLevel());
//
//        mallMemberVo.setVipInfo(mallVipConfig);
//        mallMemberVo.setBalance(wallet.getBalance());
//        mallMemberVo.setScore(wallet.getScore());
//        mallMemberVo.setPrizeScore(wallet.getPrizeScore());
////        mallMemberVo.setTotalCost(mallOrderInfoMapper.selectTotalAmount(id));
//
//        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());
//            List<HappyMemberLabel> happyMemberLabels = happyMemberLabelMapper.selectList(
//                    new LambdaQueryWrapper<HappyMemberLabel>()
//                            .select(HappyMemberLabel::getIconPng,  HappyMemberLabel::getName)
//                            .in(HappyMemberLabel::getId, collect)
//            );
//            if(CollUtil.isNotEmpty(happyMemberLabels)){
//                ArrayList<ApiLabelInfoVo> apiMemberLabelVos = new ArrayList<>();
//                for (HappyMemberLabel happyMemberLabel : happyMemberLabels) {
//                    ApiLabelInfoVo apiLabelInfoVo = new ApiLabelInfoVo();
//                    apiLabelInfoVo.setIconPng(happyMemberLabel.getIconPng());
//                    apiLabelInfoVo.setName(happyMemberLabel.getName());
//                    apiMemberLabelVos.add(apiLabelInfoVo);
//                }
//                mallMemberVo.setLabelList(apiMemberLabelVos);
//            }
//        }
        return new FebsResponse().success().data(mallMemberVo);
    }

@@ -880,16 +880,18 @@
            mallMember.setBirthday(apiXcxSaveInfoDto.getBirthday());
        }

        List<MallVipConfig> configs = mallVipConfigMapper.selectVipConfigList();
        if (StrUtil.isBlank(mallMember.getLevel()) && CollUtil.isNotEmpty(configs)) {
            MallVipConfig mallVipConfig = configs.get(0);
            mallMember.setLevel(mallVipConfig.getCode());
        }
//        List<MallVipConfig> configs = mallVipConfigMapper.selectVipConfigList();
//        if (StrUtil.isBlank(mallMember.getLevel()) && CollUtil.isNotEmpty(configs)) {
//            MallVipConfig mallVipConfig = configs.get(0);
//            mallMember.setLevel(mallVipConfig.getCode());
//        }

        if(ObjectUtil.isNotEmpty(apiXcxSaveInfoDto.getGender())){
            mallMember.setSex(1 == apiXcxSaveInfoDto.getGender() ? "女" : "男");
        }


        String memberUuid = mallMember.getMemberUuid();
        String companyId = apiXcxSaveInfoDto.getCompanyId();
        if(ObjectUtil.isNotEmpty(apiXcxSaveInfoDto.getCompanyId())){
            AiCompany aiCompany = aiCompanyMapper.selectOne(
@@ -902,24 +904,26 @@
            }
            if (ObjectUtil.isNotEmpty(aiCompany)){
                companyId = aiCompany.getId();

                AiCompanyMemberApply aiCompanyMemberApply = new AiCompanyMemberApply();
                aiCompanyMemberApply.setMemberId(memberUuid);
                aiCompanyMemberApply.setCompanyCode(aiCompany.getCode());
                aiCompanyMemberApply.setCompanyName(aiCompany.getName());
                aiCompanyMemberApply.setState(0);
                aiCompanyMemberApply.setCreatedTime(new Date());
                aiCompanyMemberApplyMapper.insert(aiCompanyMemberApply);
            }
        }else{

            companyId = AiCommonEnum.COMPANY_ID.getPrompt();
        }
        mallMember.setCompanyId(companyId);
//        mallMember.setCompanyId(companyId);
        this.baseMapper.updateById(mallMember);

        String memberUuid = mallMember.getMemberUuid();
        AiMember aiMember = aiMemberService.getById(memberUuid);
        if (ObjectUtil.isNotEmpty(aiMember) && StrUtil.isNotEmpty(mallMember.getCompanyId())){
            aiMemberService.update(null,
                    Wrappers.lambdaUpdate(AiMember.class)
                    .set(AiMember::getCompanyId, mallMember.getCompanyId())
                    .eq(AiMember::getId, aiMember.getId())
                    );
        }

//        AiMember aiMember = aiMemberService.getById(memberUuid);
//        if (ObjectUtil.isNotEmpty(aiMember) && StrUtil.isNotEmpty(mallMember.getCompanyId())){
//            aiMemberService.update(null,
//                    Wrappers.lambdaUpdate(AiMember.class)
//                    .set(AiMember::getCompanyId, mallMember.getCompanyId())
//                    .eq(AiMember::getId, aiMember.getId())
//                    );
//        }

//        //完善信息赠送新人礼
//        if (StrUtil.isNotBlank(mallMember.getPhone()) && mallMember.getNewGift() == 0) {