From 491372c3bffec87342f9f7f5546e2e83d5645d67 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sun, 04 Feb 2024 18:09:06 +0800
Subject: [PATCH] 确认收货更新用户的会员信息
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 141 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 132 insertions(+), 9 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 9ee508a..16cafbd 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
@@ -61,6 +61,9 @@
private final MallRegisterAppealMapper mallRegisterAppealMapper;
private final MallMemberBankMapper mallMemberBankMapper;
private final IMallMoneyFlowService mallMoneyFlowService;
+ private final MallProductBuyRecordMapper mallProductBuyRecordMapper;
+ private final MallProductBuyMapper mallProductBuyMapper;
+ private final MallMemberSpeakMapper mallMemberSpeakMapper;
@Value("${spring.profiles.active}")
@@ -102,9 +105,10 @@
}
// mallMember.setName(registerDto.getName());
// mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
- mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_DISABLED);
+ mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.getCode());
+ mallMember.setIsFrozen(ProductEnum.MEMBER_UNFROZEN.getValue());
// mallMember.setSex("男");
// mallMember.setBindPhone(registerDto.getAccount());
@@ -147,7 +151,15 @@
MallMemberAmount mallMemberAmount = new MallMemberAmount();
mallMemberAmount.setMemberId(mallMember.getId());
mallMemberAmountMapper.insert(mallMemberAmount);
- return new FebsResponse().success().message("注册成功");
+
+ MallMemberPayment mallMemberPayment = new MallMemberPayment();
+ mallMemberPayment.setMemberId(mallMember.getId());
+ mallMemberPaymentMapper.insert(mallMemberPayment);
+
+ ApiRegisterVo apiRegisterVo = new ApiRegisterVo();
+ apiRegisterVo.setAccount(mallMember.getAccountLogin());
+ apiRegisterVo.setUserKey(mallMember.getUserKey());
+ return new FebsResponse().success().data(apiRegisterVo);
}
@Override
@@ -230,6 +242,16 @@
mallMemberVo.setHasPayment(1);
}
+ DataDictionaryCustom nftMinDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.NFT_MIN.getType(),
+ DataDictionaryEnum.NFT_MIN.getCode());
+ mallMemberVo.setNftMin(ObjectUtil.isEmpty(nftMinDic) ? new BigDecimal(100) : new BigDecimal(nftMinDic.getValue()));
+
+ DataDictionaryCustom outFcmMinDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.OUT_FCM_MIN.getType(),
+ DataDictionaryEnum.OUT_FCM_MIN.getCode());
+ mallMemberVo.setOutFcmMin(ObjectUtil.isEmpty(outFcmMinDic) ? new BigDecimal(100) : new BigDecimal(outFcmMinDic.getValue()));
+
DataDictionaryCustom fcmPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.FCM_PRICE.getType(),
DataDictionaryEnum.FCM_PRICE.getCode());
@@ -239,11 +261,33 @@
DataDictionaryEnum.OUT_FCM_FEE.getType(),
DataDictionaryEnum.OUT_FCM_FEE.getCode());
mallMemberVo.setOutFcmFee(ObjectUtil.isEmpty(outFcmFeeDic) ? new BigDecimal(20) : new BigDecimal(outFcmFeeDic.getValue()));
+
+ DataDictionaryCustom nftFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.NFT_FEE.getType(),
+ DataDictionaryEnum.NFT_FEE.getCode());
+ BigDecimal nftFeePercent = ObjectUtil.isEmpty(nftFeeDic) ? new BigDecimal(20) : new BigDecimal(nftFeeDic.getValue());
+ mallMemberVo.setNftFee(nftFeePercent);
+
+ DataDictionaryCustom memberFrozenFcmCntDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.MEMBER_FROZEN_FCM_CNT.getType(),
+ DataDictionaryEnum.MEMBER_FROZEN_FCM_CNT.getCode()
+ );
+ BigDecimal memberFrozenFcmCnt = ObjectUtil.isEmpty(memberFrozenFcmCntDic) ? new BigDecimal(100) : new BigDecimal(memberFrozenFcmCntDic.getValue());
+ mallMemberVo.setUnfrozenCnt(memberFrozenFcmCnt);
+
+ DataDictionaryCustom insureMinuteDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.INSURE_END_MINUTE.getType(),
+ DataDictionaryEnum.INSURE_END_MINUTE.getCode()
+ );
+ Integer insureMinute = Integer.parseInt(ObjectUtil.isEmpty(insureMinuteDic) ? "60" : insureMinuteDic.getValue());
+ mallMemberVo.setMinuteCnt(insureMinute);
+
DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL, mallMember.getLevel());
if (dic != null) {
mallMemberVo.setLevelName(dic.getDescription());
}
MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(mallMember.getId());
+ mallMemberVo.setGsd(mallMemberAmount.getGsd());
mallMemberVo.setStaticNft(mallMemberAmount.getStaticNft());
mallMemberVo.setTrendsNft(mallMemberAmount.getTrendsNft());
mallMemberVo.setFrozenNft(mallMemberAmount.getFrozenNft());
@@ -261,6 +305,9 @@
DataDictionaryEnum.YU_YUE_END_TIME.getCode()
);
mallMemberVo.setEndTime(endTimeDic.getValue());
+
+ Integer pickCount = mallProductBuyMapper.selectListByMemberIdAndState(id);
+ mallMemberVo.setPickCount(pickCount);
return new FebsResponse().success().data(mallMemberVo);
}
@@ -336,6 +383,59 @@
}
@Override
+ public FebsResponse teamFcmList(TeamListDto teamListDto) {
+ Long memberId = null;
+ if (ObjectUtil.isEmpty(teamListDto.getId())) {
+ memberId = LoginUserUtil.getLoginUser().getId();
+ } else {
+ memberId = teamListDto.getId();
+ }
+
+ MallMember mallMember = this.baseMapper.selectById(memberId);
+
+ MyFcmTeamVo myTeamVo = new MyFcmTeamVo();
+ myTeamVo.setMemberId(mallMember.getId());
+ myTeamVo.setAccountLogin(mallMember.getAccountLogin());
+ myTeamVo.setIsFrozen(mallMember.getIsFrozen());
+ myTeamVo.setLevelName(MemberLevelNewEnum.ZERO_LEVEL.getLevelName(mallMember.getLevel()));
+ myTeamVo.setMyAchieveBuy(this.baseMapper.selectAchieveBuyByMemberId(mallMember.getInviteId(), 1));
+ myTeamVo.setMyAchieveSell(this.baseMapper.selectAchieveSellByMemberId(mallMember.getInviteId(), 1));
+ myTeamVo.setMyTeamAchieveBuy(this.baseMapper.selectAchieveBuyByMemberId(mallMember.getInviteId(), 2));
+ myTeamVo.setMyTeamAchieveSell(this.baseMapper.selectAchieveSellByMemberId(mallMember.getInviteId(), 2));
+ myTeamVo.setMyTeamMemberCnt(this.baseMapper.selectAllChildAgentListByInviteId(mallMember.getInviteId()).size());
+ Integer buyCnt = this.baseMapper.selectAchieveBuyOrderCntByMemberId(mallMember.getInviteId());
+ Integer sellCnt = this.baseMapper.selectAchieveSellOrderCntByMemberId(mallMember.getInviteId());
+ myTeamVo.setMyTeamOrderCnt(buyCnt+sellCnt);
+
+ List<MallMember> mallMembersDirects = this.baseMapper.selectChildAgentListByInviteId(mallMember.getInviteId());
+ List<MyFcmTeamVo> list = new ArrayList<>();
+ if(CollUtil.isNotEmpty(mallMembersDirects)){
+ for(MallMember mallMembersDirect : mallMembersDirects){
+ MyFcmTeamVo myTeamDirectVo = new MyFcmTeamVo();
+ myTeamDirectVo.setMemberId(mallMembersDirect.getId());
+ myTeamDirectVo.setAccountLogin(mallMembersDirect.getAccountLogin());
+ myTeamDirectVo.setIsFrozen(mallMembersDirect.getIsFrozen());
+ myTeamDirectVo.setLevelName(MemberLevelNewEnum.ZERO_LEVEL.getLevelName(mallMembersDirect.getLevel()));
+ myTeamDirectVo.setMyAchieveBuy(this.baseMapper.selectAchieveBuyByMemberId(mallMembersDirect.getInviteId(), 1));
+ myTeamDirectVo.setMyAchieveSell(this.baseMapper.selectAchieveSellByMemberId(mallMembersDirect.getInviteId(), 1));
+ myTeamDirectVo.setMyTeamAchieveBuy(this.baseMapper.selectAchieveBuyByMemberId(mallMembersDirect.getInviteId(), 2));
+ myTeamDirectVo.setMyTeamAchieveSell(this.baseMapper.selectAchieveSellByMemberId(mallMembersDirect.getInviteId(), 2));
+ myTeamDirectVo.setMyTeamMemberCnt(this.baseMapper.selectAllChildAgentListByInviteId(mallMembersDirect.getInviteId()).size());
+ Integer buyCntDirect = this.baseMapper.selectAchieveBuyOrderCntByMemberId(mallMembersDirect.getInviteId());
+ Integer sellCntDirect = this.baseMapper.selectAchieveSellOrderCntByMemberId(mallMembersDirect.getInviteId());
+ myTeamDirectVo.setMyTeamOrderCnt(buyCntDirect+sellCntDirect);
+ list.add(myTeamDirectVo);
+ }
+ }
+
+ myTeamVo.setTeam(list);
+
+
+
+ return new FebsResponse().success().data(myTeamVo);
+ }
+
+ @Override
public MyTeamVo teamListForMine(TeamListDto teamListDto) {
return null;
}
@@ -345,7 +445,8 @@
IPage<MoneyFlowVo> page = new Page<>(moneyFlowDto.getPageNum(), moneyFlowDto.getPageSize());
Long id = LoginUserUtil.getLoginUser().getId();
moneyFlowDto.setMemberId(id);
- IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiMoneyFlowInPage(page, moneyFlowDto);
+// IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiMoneyFlowInPage(page, moneyFlowDto);
+ IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiFcmMoneyFlowInPage(page, moneyFlowDto);
return new FebsResponse().success().data(pages);
}
@@ -372,7 +473,7 @@
BigDecimal amount = transferDto.getAmount();
int type = transferDto.getType();
- if(1 != type || 2 != type){
+ if(1 != type && 2 != type){
throw new FebsException("请选择互转类型");
}
Integer insideWith = loginMember.getInsideWith() == null ? 2 :loginMember.getInsideWith();
@@ -428,7 +529,7 @@
}
if(2 == type){
if (amount.compareTo(mallMemberAmountLogin.getTokenAva()) > 0) {
- throw new FebsException("令牌不足");
+ throw new FebsException("宝石不足");
}
mallMemberAmountLogin.setTokenAva(mallMemberAmountLogin.getTokenAva().subtract(amount));
mallMemberAmountMapper.updateTokenAvaById(mallMemberAmountLogin);
@@ -759,6 +860,7 @@
@Override
public FebsResponse unfreeze(UnfreezeDto unfreezeDto) {
Long memberId = LoginUserUtil.getLoginUser().getId();
+ MallMember loginMember = this.baseMapper.selectById(memberId);
/**
* 判断账号是否冻结
* 判断账号FCM代币是否足够
@@ -778,13 +880,13 @@
DataDictionaryEnum.MEMBER_FROZEN_FCM_CNT.getCode()
);
BigDecimal memberFrozenFcmCnt = new BigDecimal(memberFrozenFcmCntDic.getValue());
- MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(unfreezeMemberId);
+ MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(memberId);
BigDecimal fcmCntAva = mallMemberAmount.getFcmCntAva();
if(memberFrozenFcmCnt.compareTo(fcmCntAva) > 0){
- throw new FebsException("解除冻结需要FCM的数量为：" + fcmCntAva);
+ throw new FebsException("解除冻结需要GFA的数量为：" + fcmCntAva);
}
if(2 == unfreezeDto.getType()){
- List<MallMember> mallMembers = this.baseMapper.selectByRefererId(mallMember.getInviteId());
+ List<MallMember> mallMembers = this.baseMapper.selectByRefererId(loginMember.getInviteId());
List<Long> collectMemberIds = mallMembers.stream().map(MallMember::getId).collect(Collectors.toList());
if(!collectMemberIds.contains(unfreezeMemberId)){
throw new FebsException("直接推荐人才能解除账户的冻结状态");
@@ -797,7 +899,7 @@
this.baseMapper.updateById(mallMember);
mallMoneyFlowService.addMoneyFlow(
- mallMember.getId(),
+ memberId,
memberFrozenFcmCnt.negate(),
MoneyFlowTypeNewEnum.UNFREEZE_USER.getValue(),
MallUtils.getOrderNum(),
@@ -808,6 +910,27 @@
return new FebsResponse().success().message("操作成功");
}
+ @Override
+ public FebsResponse memberSpeak(ApiMemberSpeakDto memberSpeakDto) {
+ MallMemberSpeak mallMemberSpeak = new MallMemberSpeak();
+ if(ObjectUtil.isNotEmpty(memberSpeakDto.getMemberId())){
+ mallMemberSpeak.setMemberId(memberSpeakDto.getMemberId());
+ }
+ mallMemberSpeak.setState(ProductEnum.SPEAK_NO_DEAL.getValue());
+ mallMemberSpeak.setDescription(memberSpeakDto.getDescription());
+ mallMemberSpeakMapper.insert(mallMemberSpeak);
+ return new FebsResponse().success().message("操作成功");
+ }
+
+ @Override
+ public FebsResponse moneyFlowInside(MoneyFlowDto moneyFlowDto) {
+ IPage<MoneyFlowVo> page = new Page<>(moneyFlowDto.getPageNum(), moneyFlowDto.getPageSize());
+ Long id = LoginUserUtil.getLoginUser().getId();
+ moneyFlowDto.setMemberId(id);
+ IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiFcmMoneyFlowInsideInPage(page, moneyFlowDto);
+ return new FebsResponse().success().data(pages);
+ }
+
public static void main(String[] args) {
Set<String> objectsAccount = new HashSet<>();
Set<String> objects = new HashSet<>();
--
Gitblit v1.9.1