From db3cae271670815fc0bc8127dc71fa979a1df243 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 19 Feb 2024 16:14:31 +0800
Subject: [PATCH] 文件上传服务器地址
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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 0c98112..0635ce0 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
@@ -109,6 +109,7 @@
mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.getCode());
mallMember.setIsFrozen(ProductEnum.MEMBER_UNFROZEN.getValue());
+ mallMember.setPartner(2);
// mallMember.setSex("男");
// mallMember.setBindPhone(registerDto.getAccount());
@@ -282,11 +283,14 @@
Integer insureMinute = Integer.parseInt(ObjectUtil.isEmpty(insureMinuteDic) ? "60" : insureMinuteDic.getValue());
mallMemberVo.setMinuteCnt(insureMinute);
- DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL, mallMember.getLevel());
+ DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(mallMember.getLevel(), mallMember.getLevel());
if (dic != null) {
mallMemberVo.setLevelName(dic.getDescription());
+ }else{
+ mallMemberVo.setLevelName("非会员");
}
MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(mallMember.getId());
+ mallMemberVo.setGsd(mallMemberAmount.getGsd());
mallMemberVo.setStaticNft(mallMemberAmount.getStaticNft());
mallMemberVo.setTrendsNft(mallMemberAmount.getTrendsNft());
mallMemberVo.setFrozenNft(mallMemberAmount.getFrozenNft());
@@ -307,6 +311,9 @@
Integer pickCount = mallProductBuyMapper.selectListByMemberIdAndState(id);
mallMemberVo.setPickCount(pickCount);
+
+ BigDecimal totalPerk = mallProductBuyMapper.selectTotalPerkByMemberId(mallMember.getId());
+ mallMemberVo.setTotalPerk(totalPerk);
return new FebsResponse().success().data(mallMemberVo);
}
@@ -528,7 +535,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);
@@ -879,10 +886,10 @@
DataDictionaryEnum.MEMBER_FROZEN_FCM_CNT.getCode()
);
BigDecimal memberFrozenFcmCnt = new BigDecimal(memberFrozenFcmCntDic.getValue());
- MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(unfreezeMemberId);
- BigDecimal fcmCntAva = mallMemberAmount.getFcmCntAva();
+ MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(memberId);
+ BigDecimal fcmCntAva = mallMemberAmount.getTokenAva();
if(memberFrozenFcmCnt.compareTo(fcmCntAva) > 0){
- throw new FebsException("解除冻结需要FCM的数量为：" + fcmCntAva);
+ throw new FebsException("激活需要宝石的数量为：" + fcmCntAva);
}
if(2 == unfreezeDto.getType()){
List<MallMember> mallMembers = this.baseMapper.selectByRefererId(loginMember.getInviteId());
@@ -892,18 +899,18 @@
}
}
BigDecimal fcmCntAvaSub = fcmCntAva.subtract(memberFrozenFcmCnt);
- mallMemberAmount.setFcmCntAva(fcmCntAvaSub);
+ mallMemberAmount.setTokenAva(fcmCntAvaSub);
mallMemberAmountMapper.updateById(mallMemberAmount);
mallMember.setIsFrozen(ProductEnum.MEMBER_UNFROZEN.getValue());
this.baseMapper.updateById(mallMember);
mallMoneyFlowService.addMoneyFlow(
- mallMember.getId(),
+ memberId,
memberFrozenFcmCnt.negate(),
MoneyFlowTypeNewEnum.UNFREEZE_USER.getValue(),
MallUtils.getOrderNum(),
memberId,
- FlowTypeNewEnum.FCM_COIN.getValue(),
+ FlowTypeNewEnum.TOKEN.getValue(),
MoneyFlowTypeNewEnum.UNFREEZE_USER.getDescrition());
return new FebsResponse().success().message("操作成功");
--
Gitblit v1.9.1