From 9f7e4912c6982bc7ec63a70cd29925f2e795e3fd Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 05 Jun 2025 13:56:04 +0800
Subject: [PATCH] refactor(mall): 修正会员标签相关代码
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 355 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 306 insertions(+), 49 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 bddc8fd..a6d7626 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
@@ -9,11 +9,16 @@
import cc.mrbird.febs.mall.conversion.MallShopApplyConversion;
import cc.mrbird.febs.mall.conversion.MallStoreConversion;
import cc.mrbird.febs.mall.dto.*;
+import cc.mrbird.febs.mall.dto.memberLevel.ApiMemberLabelAddDto;
+import cc.mrbird.febs.mall.dto.memberLevel.ApiMemberLabelInfoDto;
+import cc.mrbird.febs.mall.dto.memberLevel.ApiMemberLabelInsureDto;
+import cc.mrbird.febs.mall.dto.memberLevel.ApiMemberLabelItemDto;
import cc.mrbird.febs.mall.dto.signActivity.ApiNewGiftSettingDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.*;
import cc.mrbird.febs.mall.vo.*;
+import cc.mrbird.febs.mall.vo.memberLevel.*;
import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
import cc.mrbird.febs.pay.service.IXcxPayService;
import cc.mrbird.febs.pay.util.MD5;
@@ -36,6 +41,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
@@ -90,6 +96,8 @@
private final MallDoctorMapper mallDoctorMapper;
private final HappyMemberLevelMapper happyMemberLevelMapper;
private final IApiMallMemberWalletService mallMemberWalletService;
+ private final HappyMemberLabelRecordMapper happyMemberLabelRecordMapper;
+ private final HappyMemberLabelMapper happyMemberLabelMapper;
@Value("${spring.profiles.active}")
@@ -271,7 +279,7 @@
HappyMemberLevel happyMemberLevel = happyMemberLevelMapper.selectOne(
new LambdaQueryWrapper<HappyMemberLevel>()
- .select(HappyMemberLevel::getName)
+ .select(HappyMemberLevel::getName, HappyMemberLevel::getIconPng)
.eq(HappyMemberLevel::getCode, mallMember.getDirector())
);
if(happyMemberLevel != null){
@@ -323,6 +331,31 @@
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);
}
@@ -704,9 +737,29 @@
//分销员的邀请码赠送优惠卷
if (StrUtil.isNotBlank(apiXcxLoginDto.getInviteId())) {
- GetCouponDto getCouponDto = new GetCouponDto();
- getCouponDto.setInviteId(apiXcxLoginDto.getInviteId());
- scanCoupon(getCouponDto);
+ 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())) {
@@ -776,49 +829,49 @@
mallMember.setSex(1 == apiXcxSaveInfoDto.getGender() ? "女" : "男");
this.baseMapper.updateById(mallMember);
- //完善信息赠送新人礼
- if (StrUtil.isNotBlank(mallMember.getPhone()) && mallMember.getNewGift() == 0) {
- DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
- CommonDictionaryEnum.NEW_GIFT_SETTING.getType(),
- CommonDictionaryEnum.NEW_GIFT_SETTING.getCode()
- );
- mallMember.setNewGift(1);
- this.baseMapper.updateById(mallMember);
-
- ApiNewGiftSettingDto apiNewGiftSettingDto = JSONObject.parseObject(dic.getValue(), ApiNewGiftSettingDto.class);
- if (apiNewGiftSettingDto.getState() == 1) {
- String prizeScore = apiNewGiftSettingDto.getPrizeScore();
- BigDecimal bigDecimal = new BigDecimal(prizeScore).setScale(0, RoundingMode.HALF_DOWN);
- if (bigDecimal.compareTo(BigDecimal.ZERO) > 0) {
- walletService.add(bigDecimal, mallMember.getId(), "prizeScore");
- mallMoneyFlowService.addMoneyFlow(
- mallMember.getId(),
- bigDecimal,
- ScoreFlowTypeEnum.MEMBER_INFO_GIFT.getValue(),
- MallUtils.getOrderNum(),
- FlowTypeEnum.PRIZE_SCORE.getValue(),
- StrUtil.format(ScoreFlowTypeEnum.MEMBER_INFO_GIFT.getDesc(),bigDecimal),
- 2
- );
- }
- if (apiNewGiftSettingDto.getCouponId() != null) {
- MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(apiNewGiftSettingDto.getCouponId());
- if(ObjectUtil.isNotEmpty(mallGoodsCoupon)){
- MallMemberCoupon memberCoupon = new MallMemberCoupon();
- memberCoupon.setCouponId(mallGoodsCoupon.getId());
- memberCoupon.setCouponName(mallGoodsCoupon.getName());
- memberCoupon.setInviteId(mallMember.getInviteId());
- memberCoupon.setCouponUuid(IdUtil.simpleUUID());
- memberCoupon.setState(1);
- memberCoupon.setFromType(3);
- memberCoupon.setExpireTime(DateUtil.offsetDay(DateUtil.date(), mallGoodsCoupon.getExpireDay()));
- memberCoupon.setMemberId(mallMember.getId());
- mallMemberCouponMapper.insert(memberCoupon);
- }
- }
-
- }
- }
+// //完善信息赠送新人礼
+// if (StrUtil.isNotBlank(mallMember.getPhone()) && mallMember.getNewGift() == 0) {
+// DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+// CommonDictionaryEnum.NEW_GIFT_SETTING.getType(),
+// CommonDictionaryEnum.NEW_GIFT_SETTING.getCode()
+// );
+// mallMember.setNewGift(1);
+// this.baseMapper.updateById(mallMember);
+//
+// ApiNewGiftSettingDto apiNewGiftSettingDto = JSONObject.parseObject(dic.getValue(), ApiNewGiftSettingDto.class);
+// if (apiNewGiftSettingDto.getState() == 1) {
+// String prizeScore = apiNewGiftSettingDto.getPrizeScore();
+// BigDecimal bigDecimal = new BigDecimal(prizeScore).setScale(0, RoundingMode.HALF_DOWN);
+// if (bigDecimal.compareTo(BigDecimal.ZERO) > 0) {
+// walletService.add(bigDecimal, mallMember.getId(), "prizeScore");
+// mallMoneyFlowService.addMoneyFlow(
+// mallMember.getId(),
+// bigDecimal,
+// ScoreFlowTypeEnum.MEMBER_INFO_GIFT.getValue(),
+// MallUtils.getOrderNum(),
+// FlowTypeEnum.PRIZE_SCORE.getValue(),
+// StrUtil.format(ScoreFlowTypeEnum.MEMBER_INFO_GIFT.getDesc(),bigDecimal),
+// 2
+// );
+// }
+// if (apiNewGiftSettingDto.getCouponId() != null) {
+// MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(apiNewGiftSettingDto.getCouponId());
+// if(ObjectUtil.isNotEmpty(mallGoodsCoupon)){
+// MallMemberCoupon memberCoupon = new MallMemberCoupon();
+// memberCoupon.setCouponId(mallGoodsCoupon.getId());
+// memberCoupon.setCouponName(mallGoodsCoupon.getName());
+// memberCoupon.setInviteId(mallMember.getInviteId());
+// memberCoupon.setCouponUuid(IdUtil.simpleUUID());
+// memberCoupon.setState(1);
+// memberCoupon.setFromType(3);
+// memberCoupon.setExpireTime(DateUtil.offsetDay(DateUtil.date(), mallGoodsCoupon.getExpireDay()));
+// memberCoupon.setMemberId(mallMember.getId());
+// mallMemberCouponMapper.insert(memberCoupon);
+// }
+// }
+//
+// }
+// }
return new FebsResponse().success();
}
@@ -1611,8 +1664,6 @@
if(apiMemberNewGiftSettingVo.getState() == 1 && apiMemberNewGiftSettingVo.getOpenState() == 1){
mallMember.setNewGift(1);
- mallMember.setLastLoginTime(new Date());
- this.baseMapper.updateById(mallMember);
BigDecimal prizeScore = new BigDecimal(StrUtil.isBlank(apiNewGiftSettingDto.getPrizeScore()) ? "0" : apiNewGiftSettingDto.getPrizeScore())
.setScale(0, RoundingMode.HALF_DOWN);
@@ -1664,11 +1715,217 @@
}
}
+ mallMember.setLastLoginTime(new Date());
+ this.baseMapper.updateById(mallMember);
+
// this.baseMapper.updateLastLoginTime(memberId,new Date());
return new FebsResponse().success().data(apiMemberNewGiftSettingVo);
}
+ @Override
+ public FebsResponse getLabelList() {
+
+ // 获取当前登录用户的ID
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+
+ ArrayList<ApiMemberLabelVo> apiMemberLabelVos = new ArrayList<>();
+
+ List<HappyMemberLabelRecord> happyMemberLabelRecords = happyMemberLabelRecordMapper.selectList(
+ new LambdaQueryWrapper<HappyMemberLabelRecord>()
+ .eq(HappyMemberLabelRecord::getMemberId,memberId)
+ );
+ 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::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());
+ apiMemberLabelVo.setIconPng(happyMemberLabel.getIconPng());
+ apiMemberLabelVos.add(apiMemberLabelVo);
+ }
+ }
+ }
+
+ return new FebsResponse().success().data(apiMemberLabelVos);
+ }
+
+ @Override
+ public FebsResponse getLabelListById(ApiMemberLabelInfoDto dto) {
+ // 获取当前登录用户的ID
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+
+ List<ApiMemberLabelInfoVo> apiMemberLabelInfoVos = new ArrayList<>();
+
+ HappyMemberLabelRecord happyMemberLabelRecord = happyMemberLabelRecordMapper.selectOne(
+ Wrappers.lambdaQuery(HappyMemberLabelRecord.class)
+ .eq(HappyMemberLabelRecord::getMemberId, memberId)
+ .eq(HappyMemberLabelRecord::getLabelId, dto.getId())
+ );
+ if(ObjectUtil.isEmpty(happyMemberLabelRecord)){
+ throw new FebsException("您没有该会员标签");
+ }
+ HappyMemberLabel happyMemberLabel = happyMemberLabelMapper.selectById(dto.getId());
+ if(ObjectUtil.isEmpty(happyMemberLabel)){
+ throw new FebsException("您没有该会员标签");
+ }
+ if(!ObjectUtil.equal(happyMemberLabel.getCode(),1)){
+ throw new FebsException("没有查看权限");
+ }
+
+ List<HappyMemberLabel> happyMemberLabels = happyMemberLabelMapper.selectList(
+ Wrappers.lambdaQuery(HappyMemberLabel.class)
+ .eq(HappyMemberLabel::getParentId, dto.getId())
+ );
+ if(CollUtil.isNotEmpty(happyMemberLabels)){
+ for (HappyMemberLabel happyMemberLabelItem : happyMemberLabels) {
+ ApiMemberLabelInfoVo apiMemberLabelInfoVo = new ApiMemberLabelInfoVo();
+
+ apiMemberLabelInfoVo.setId(happyMemberLabelItem.getId());
+ apiMemberLabelInfoVo.setName(happyMemberLabelItem.getName());
+ apiMemberLabelInfoVos.add(apiMemberLabelInfoVo);
+ }
+ }
+
+ return new FebsResponse().success().data(apiMemberLabelInfoVos);
+ }
+
+ @Override
+ public FebsResponse getMemberLabelListById(ApiMemberLabelItemDto dto) {
+
+ // 获取当前登录用户的ID
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+
+ List<ApiMemberLabelItemVo> apiMemberLabelItemVos = new ArrayList<>();
+
+ Integer labelId = dto.getLabelId();
+ List<HappyMemberLabelRecord> happyMemberLabelRecords = happyMemberLabelRecordMapper.selectList(
+ Wrappers.lambdaQuery(HappyMemberLabelRecord.class)
+ .eq(HappyMemberLabelRecord::getLabelId, labelId)
+ );
+ if(CollUtil.isNotEmpty(happyMemberLabelRecords)){
+
+ //stream流操作happyMemberLabelRecords,返回memberId的set集合
+ Set<Long> memberIdSet = happyMemberLabelRecords.stream().map(HappyMemberLabelRecord::getMemberId).collect(Collectors.toSet());
+ List<MallMember> mallMembers = this.baseMapper.selectList(
+ Wrappers.lambdaQuery(MallMember.class)
+ .select(MallMember::getId, MallMember::getName, MallMember::getPhone, MallMember::getAvatar)
+ .in(MallMember::getId, memberIdSet)
+ .eq(MallMember::getAccountStatus, MallMember.ACCOUNT_STATUS_ENABLE)
+ );
+ for (MallMember mallMember : mallMembers){
+ ApiMemberLabelItemVo apiMemberLabelItemVo = new ApiMemberLabelItemVo();
+ apiMemberLabelItemVo.setName(mallMember.getName());
+ apiMemberLabelItemVo.setAvatar(mallMember.getAvatar());
+ apiMemberLabelItemVo.setPhone(mallMember.getPhone());
+ apiMemberLabelItemVos.add(apiMemberLabelItemVo);
+ }
+ }
+
+ return new FebsResponse().success().data(apiMemberLabelItemVos);
+ }
+
+ @Override
+ public FebsResponse addLabelMember(ApiMemberLabelAddDto dto) {
+
+ // 获取当前登录用户的ID
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+
+ ApiMemberLabelAddVo apiMemberLabelAddVo = new ApiMemberLabelAddVo();
+
+ Integer labelId = dto.getLabelId();
+ String phone = dto.getPhone();
+
+ List<MallMember> mallMembers = this.baseMapper.selectList(
+ Wrappers.lambdaQuery(MallMember.class)
+ .eq(MallMember::getPhone, phone)
+ );
+ if(CollUtil.isEmpty(mallMembers)){
+ throw new FebsException("未查询到用户");
+ }
+
+ MallMember mallMember = mallMembers.get(0);
+ apiMemberLabelAddVo.setMemberId(mallMember.getId());
+ apiMemberLabelAddVo.setName(mallMember.getName());
+ apiMemberLabelAddVo.setPhone(mallMember.getPhone());
+
+ HappyMemberLabel happyMemberLabel = happyMemberLabelMapper.selectById(labelId);
+ apiMemberLabelAddVo.setLabelId(happyMemberLabel.getId());
+ apiMemberLabelAddVo.setLabelName(happyMemberLabel.getName());
+
+ //获取会员标签
+ Integer integer = happyMemberLabelRecordMapper.selectCount(
+ Wrappers.lambdaQuery(HappyMemberLabelRecord.class)
+ .eq(HappyMemberLabelRecord::getMemberId, mallMember.getId())
+ .eq(HappyMemberLabelRecord::getLabelId, labelId)
+ );
+ if(integer > 0){
+ apiMemberLabelAddVo.setState(0);
+ }else{
+ apiMemberLabelAddVo.setState(1);
+ }
+ return new FebsResponse().success().data(apiMemberLabelAddVo);
+ }
+
+ @Override
+ public FebsResponse insureLabelMember(ApiMemberLabelInsureDto dto) {
+
+ // 获取当前登录用户的ID
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ Long labelId = dto.getLabelId();
+ Long insureMemberId = dto.getMemberId();
+
+ HappyMemberLabel happyMemberLabel = happyMemberLabelMapper.selectById(labelId);
+ if(ObjectUtil.isEmpty(happyMemberLabel)){
+ throw new FebsException("会员标签不存在");
+ }
+ if(happyMemberLabel.getParentId() == 0){
+ throw new FebsException("会员标签不存在");
+ }
+
+ Long parentId = happyMemberLabel.getParentId();
+ HappyMemberLabel happyMemberLabelParent = happyMemberLabelMapper.selectById(parentId);
+ if(ObjectUtil.isEmpty(happyMemberLabelParent)){
+ throw new FebsException("会员标签不存在");
+ }
+ if(happyMemberLabelParent.getCode() != 1){
+ throw new FebsException("权限不足");
+ }
+
+ List<HappyMemberLabelRecord> happyMemberLabelRecordsParent = happyMemberLabelRecordMapper.selectList(
+ Wrappers.lambdaQuery(HappyMemberLabelRecord.class)
+ .eq(HappyMemberLabelRecord::getMemberId, memberId)
+ .eq(HappyMemberLabelRecord::getLabelId, parentId)
+ );
+ if(ObjectUtil.isEmpty(happyMemberLabelRecordsParent)){
+ throw new FebsException("权限不足");
+ }
+
+
+ List<HappyMemberLabelRecord> happyMemberLabelRecords = happyMemberLabelRecordMapper.selectList(
+ Wrappers.lambdaQuery(HappyMemberLabelRecord.class)
+ .eq(HappyMemberLabelRecord::getMemberId, insureMemberId)
+ .eq(HappyMemberLabelRecord::getLabelId, labelId)
+ );
+ if(CollUtil.isEmpty(happyMemberLabelRecords)){
+ HappyMemberLabelRecord happyMemberLabelRecord = new HappyMemberLabelRecord();
+ happyMemberLabelRecord.setMemberId(insureMemberId);
+ happyMemberLabelRecord.setLabelId(labelId);
+ happyMemberLabelRecordMapper.insert(happyMemberLabelRecord);
+ }
+
+ return new FebsResponse().success().message("操作成功");
+ }
+
// public static void main(String[] args) {
// Long userld = 16425L;
// String shopAccount = "爱和美医疗";
--
Gitblit v1.9.1