From b50ce4f17ad242f8e27d9fae71ee4c01623a5983 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 29 Mar 2023 10:45:50 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 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 47de2a9..e4dfc1a 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
@@ -73,7 +73,7 @@
public FebsResponse register(RegisterDto registerDto) {
MallMember mallMember = this.baseMapper.selectInfoByAccount(registerDto.getAccount());
if (mallMember != null) {
- throw new FebsException("001-该账号已被占用");
+ throw new FebsException("该账号已被使用");
}
List<MallMember> mallMembers = this.baseMapper.selectMemberByName(registerDto.getName());
@@ -335,7 +335,7 @@
MyTeamVo myTeamVo = new MyTeamVo();
myTeamVo.setTeam(list);
- myTeamVo.setMyAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 1));
+ myTeamVo.setMyAchieve(mallOrderInfoMapper.selectTotalAmount(memberId));
myTeamVo.setMyTeamAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 2));
myTeamVo.setMyTeamCnt(this.baseMapper.selectAllChildAgentListByInviteId(mallMember.getInviteId()).size());
return new FebsResponse().success().data(myTeamVo);
@@ -462,14 +462,8 @@
public BigDecimal canMoney() {
Long memberId = LoginUserUtil.getLoginUser().getId();
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
- BigDecimal profit = mallMoneyFlowMapper.selectProfitByDateAndMemberId(memberId);
-
- BigDecimal canMoney = wallet.getCommission();
- if (profit != null) {
- if(canMoney.compareTo(BigDecimal.ZERO) > 0) {
- canMoney = canMoney.subtract(profit);
- }
- }
+ BigDecimal canMoney = wallet.getBalance();
+ canMoney = canMoney.compareTo(BigDecimal.ZERO) > 0 ? canMoney : BigDecimal.ZERO;
return canMoney;
}
@@ -614,11 +608,7 @@
public FebsResponse updateMemberBank(UpdateMemberBankDto updateMemberBankDto) {
Long id = updateMemberBankDto.getId();
MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(id);
- mallMemberBank.setName(updateMemberBankDto.getName());
- mallMemberBank.setIdType(updateMemberBankDto.getIdType());
- mallMemberBank.setIdCardNum(updateMemberBankDto.getIdCardNum());
mallMemberBank.setBankNo(updateMemberBankDto.getBankNo());
- mallMemberBank.setPhone(updateMemberBankDto.getPhone());
mallMemberBankMapper.updateById(mallMemberBank);
return new FebsResponse().success();
}
@@ -725,6 +715,36 @@
);
//更新会员星级
this.baseMapper.updateAccountLevelById(buyStarDescription,mallMember.getId());
+
+ //直推返利
+ if(StrUtil.isNotEmpty(mallMember.getReferrerId())){
+ //下单人的直推上级
+ MallMember mallMemberOne = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
+ //生成直推返利的流水记录
+ if(ObjectUtil.isNotEmpty(mallMemberOne)){
+ DataDictionaryCustom rewardPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.REWARD_PERCENT.getType(),
+ DataDictionaryEnum.REWARD_PERCENT.getCode()
+ );
+ buyStarPriceBigDecimal = buyStarPriceBigDecimal.compareTo(BigDecimal.ZERO) > 0 ? buyStarPriceBigDecimal : BigDecimal.ZERO;
+ BigDecimal rewardPercent = new BigDecimal(rewardPercentDic.getValue()).multiply(new BigDecimal(0.01)).setScale(2,BigDecimal.ROUND_DOWN);
+ BigDecimal directRewardAmount = buyStarPriceBigDecimal.multiply(rewardPercent).setScale(4, BigDecimal.ROUND_DOWN);
+
+ Long marketSubsidyFlowId = mallMoneyFlowService.addMoneyFlow(
+ mallMember.getId(),
+ mallMemberStarBuy.getBuyCode(),
+ directRewardAmount,
+ MallMoneyFlowTypeEnum.DIRECT_REWARD.getCode(),
+ MallMoneyFlow.STATUS_SUCCESS,
+ MallMoneyFlow.IS_RETURN_Y,
+ mallMemberOne.getId(),
+ FlowTypeEnum.BALANCE.getValue(),
+ MallMoneyFlowTypeEnum.DIRECT_REWARD.getName()
+ );
+ memberWalletService.addBalance(directRewardAmount,mallMemberOne.getId());
+ }
+ }
+
return new FebsResponse().success();
}
}
--
Gitblit v1.9.1