From c3b9c74950118654a39e1ed8ef42a1c83abc3bb6 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 09 Apr 2026 11:58:49 +0800
Subject: [PATCH] fix(ai): 修复AI代理列表查询时公司ID为空的问题
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 192 ++++++++++++++++++++++++------------------------
1 files changed, 96 insertions(+), 96 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index c0cbc31..d21f296 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/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);
}
@@ -789,37 +789,37 @@
mallMember.setInviteId(inviteId);
mallMember.setName("新用户"+inviteId);
this.baseMapper.updateById(mallMember);
- MallMemberWallet wallet = new MallMemberWallet();
- wallet.setBalance(BigDecimal.ZERO);
- wallet.setMemberId(mallMember.getId());
- mallMemberWalletMapper.insert(wallet);
+// MallMemberWallet wallet = new MallMemberWallet();
+// wallet.setBalance(BigDecimal.ZERO);
+// wallet.setMemberId(mallMember.getId());
+// mallMemberWalletMapper.insert(wallet);
//分销员的邀请码赠送优惠卷
- if (StrUtil.isNotBlank(apiXcxLoginDto.getInviteId())) {
- String couponUUID = IdUtil.simpleUUID();
- //通过邀请人信息，获取能领取的优惠卷信息
- MallMember refMember = this.baseMapper.selectInfoByInviteId(apiXcxLoginDto.getInviteId());
- if(ObjectUtil.isNotEmpty(refMember)){
- SalemanCoupon salemanCoupon = salemanCouponMapper.selectByMemberId(refMember.getId());
- if(ObjectUtil.isNotEmpty(salemanCoupon)){
- Long couponId = salemanCoupon.getCouponId();
- List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectListByMemberIdCouponIdWithOutInviteId(mallMember.getId(), couponId);
- if(CollUtil.isEmpty(mallMemberCoupons)){
- //商品优惠卷如果绑定了，那么当前登陆者获取一张卷
- MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(couponId);
- MallMemberCoupon mallMemberCoupon = new MallMemberCoupon();
- mallMemberCoupon.setCouponId(couponId);
- mallMemberCoupon.setCouponName(mallGoodsCoupon.getName());
- mallMemberCoupon.setMemberId(mallMember.getId());
- mallMemberCoupon.setCouponUuid(couponUUID);
- mallMemberCoupon.setInviteId(refMember.getInviteId());
- mallMemberCoupon.setState(1);
- mallMemberCoupon.setExpireTime(DateUtil.offsetDay(DateUtil.date(),mallGoodsCoupon.getExpireDay()));
- mallMemberCouponMapper.insert(mallMemberCoupon);
- }
- }
- }
- }
+// if (StrUtil.isNotBlank(apiXcxLoginDto.getInviteId())) {
+// String couponUUID = IdUtil.simpleUUID();
+// //通过邀请人信息，获取能领取的优惠卷信息
+// MallMember refMember = this.baseMapper.selectInfoByInviteId(apiXcxLoginDto.getInviteId());
+// if(ObjectUtil.isNotEmpty(refMember)){
+// SalemanCoupon salemanCoupon = salemanCouponMapper.selectByMemberId(refMember.getId());
+// if(ObjectUtil.isNotEmpty(salemanCoupon)){
+// Long couponId = salemanCoupon.getCouponId();
+// List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectListByMemberIdCouponIdWithOutInviteId(mallMember.getId(), couponId);
+// if(CollUtil.isEmpty(mallMemberCoupons)){
+// //商品优惠卷如果绑定了，那么当前登陆者获取一张卷
+// MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(couponId);
+// MallMemberCoupon mallMemberCoupon = new MallMemberCoupon();
+// mallMemberCoupon.setCouponId(couponId);
+// mallMemberCoupon.setCouponName(mallGoodsCoupon.getName());
+// mallMemberCoupon.setMemberId(mallMember.getId());
+// mallMemberCoupon.setCouponUuid(couponUUID);
+// mallMemberCoupon.setInviteId(refMember.getInviteId());
+// mallMemberCoupon.setState(1);
+// mallMemberCoupon.setExpireTime(DateUtil.offsetDay(DateUtil.date(),mallGoodsCoupon.getExpireDay()));
+// mallMemberCouponMapper.insert(mallMemberCoupon);
+// }
+// }
+// }
+// }
} else {
if (MallMember.ACCOUNT_STATUS_DISABLED.equals(mallMember.getAccountStatus())) {
throw new FebsException("账号已停用");
--
Gitblit v1.9.1