From 6a99e83107428159d321c1b77cb994e0b2f92fe5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 10 Oct 2023 10:25:05 +0800
Subject: [PATCH] redbagprod
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 14 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 a29e916..5bcab9e 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
@@ -107,16 +107,16 @@
throw new FebsException("邀请码不存在");
}
/**
- * 设置成普通会员，则不允许推广
+ * 设置成粉丝，则不允许推广
*/
if(inviteMember.getLevel().equals(MemberLevelEnum.FANS.getType())){
throw new FebsException("邀请码不能推广");
}
//购买套餐产生业绩，才能推广会员
- List<MallAchieveRecord> mallAchieveRecordList = mallAchieveRecordMapper.selectByMemberId(inviteMember.getId());
- if(CollUtil.isEmpty(mallAchieveRecordList)){
- throw new FebsException("邀请码不能推广");
- }
+// List<MallAchieveRecord> mallAchieveRecordList = mallAchieveRecordMapper.selectByMemberId(inviteMember.getId());
+// if(CollUtil.isEmpty(mallAchieveRecordList)){
+// throw new FebsException("邀请码不能推广");
+// }
mallMember.setReferrerId(registerDto.getInviteId());
@@ -236,10 +236,12 @@
MallMember mallMember = this.baseMapper.selectById(id);
MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember);
-
- MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
- if (referMember != null) {
- mallMemberVo.setReferrerName(referMember.getName());
+// if(ObjectUtil.isNotEmpty(mallMember.getReferrerId())){
+ if(StrUtil.isNotBlank(mallMember.getReferrerId())){
+ MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
+ if (referMember != null) {
+ mallMemberVo.setReferrerName(referMember.getName());
+ }
}
if (StrUtil.isNotBlank(mallMember.getTradePassword())) {
@@ -252,11 +254,19 @@
}
mallMemberVo.setLevelName(MemberLevelEnum.NORMAL.getLevelDescription(mallMember.getLevel()));
mallMemberVo.setPartner(mallMember.getPartner());
+ mallMemberVo.setDirector(mallMember.getDirector());
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());
mallMemberVo.setBalance(wallet.getBalance());
mallMemberVo.setScore(wallet.getScore());
mallMemberVo.setPrizeScore(wallet.getPrizeScore());
mallMemberVo.setTotalCost(mallOrderInfoMapper.selectTotalAmount(id));
+
+ DataDictionaryCustom poolScorePriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ PerkEnum.POOL_SCORE_PRICE.getType(),
+ PerkEnum.POOL_SCORE_PRICE.getCode()
+ );
+ BigDecimal poolScorePrice = new BigDecimal(poolScorePriceDic.getValue()).setScale(8, BigDecimal.ROUND_DOWN);
+ mallMemberVo.setPoolScorePrice(poolScorePrice);
return new FebsResponse().success().data(mallMemberVo);
}
@@ -391,13 +401,24 @@
if (!loginMember.getTradePassword().equals(SecureUtil.md5(transferDto.getTradePwd()))) {
throw new FebsException("支付密码错误");
}
+ if(1 == transferDto.getType()){
+ walletService.reduceBalance(transferDto.getAmount(), memberId);
+ String orderNo = MallUtils.getOrderNum("T");
+ this.addMoneyFlow(memberId, transferDto.getAmount().negate(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, mallMember.getId(), null, FlowTypeEnum.BALANCE.getValue());
- walletService.reduceBalance(transferDto.getAmount(), memberId);
- String orderNo = MallUtils.getOrderNum("T");
- this.addMoneyFlow(memberId, transferDto.getAmount().negate(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, mallMember.getId(), null, FlowTypeEnum.BALANCE.getValue());
+ walletService.addBalance(transferDto.getAmount(), mallMember.getId());
+ this.addMoneyFlow(mallMember.getId(), transferDto.getAmount(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, memberId, null, FlowTypeEnum.BALANCE.getValue());
+ }
+ if(2 == transferDto.getType()){
+ walletService.reduce(transferDto.getAmount(), memberId, "score");
+ String orderNo = MallUtils.getOrderNum("T");
+ this.addMoneyFlow(memberId, transferDto.getAmount().negate(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, mallMember.getId(), null, FlowTypeEnum.SCORE.getValue());
- walletService.addBalance(transferDto.getAmount(), mallMember.getId());
- this.addMoneyFlow(mallMember.getId(), transferDto.getAmount(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, memberId, null, FlowTypeEnum.BALANCE.getValue());
+ walletService.add(transferDto.getAmount(), mallMember.getId(), "score");
+ this.addMoneyFlow(mallMember.getId(), transferDto.getAmount(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, memberId, null, FlowTypeEnum.SCORE.getValue());
+ }
+
+
}
@Override
@@ -486,6 +507,7 @@
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(id);
commissionVo.setCommissionBalance(wallet.getBalance());
commissionVo.setCommissionScore(wallet.getScore());
+ commissionVo.setCommission(wallet.getCommission());
commissionVo.setTodayBalance(mallMoneyFlowMapper.selectCommissionIncome(1,1, new Date(), id));
commissionVo.setMonthBalance(mallMoneyFlowMapper.selectCommissionIncome(1,2, new Date(), id));
commissionVo.setTotalBalance(mallMoneyFlowMapper.selectCommissionIncome(1, null,null, id));
@@ -597,6 +619,8 @@
mallMemberBank.setIdCardNum(updateMemberBankDto.getIdCardNum());
mallMemberBank.setBankNo(updateMemberBankDto.getBankNo());
mallMemberBank.setPhone(updateMemberBankDto.getPhone());
+ mallMemberBank.setBankName(updateMemberBankDto.getBankName());
+ mallMemberBank.setBankNameS(updateMemberBankDto.getBankNameS());
mallMemberBankMapper.updateById(mallMemberBank);
return new FebsResponse().success();
}
--
Gitblit v1.9.1