From a3030809804fbb8b10ada3a6375433143c320ff4 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 11 Jan 2024 11:15:22 +0800
Subject: [PATCH] 套餐
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 207 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 156 insertions(+), 51 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 100b886..ea5107e 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
@@ -1,12 +1,13 @@
package cc.mrbird.febs.mall.service.impl;
import cc.mrbird.febs.common.entity.FebsResponse;
-import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
-import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
-import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.*;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.*;
+import cc.mrbird.febs.mall.conversion.MallGoodsConversion;
+import cc.mrbird.febs.mall.conversion.MallMemberBankConversion;
import cc.mrbird.febs.mall.conversion.MallMemberConversion;
+import cc.mrbird.febs.mall.conversion.MallShopApplyConversion;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
@@ -33,11 +34,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.lang.reflect.Member;
import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @author wzy
@@ -59,6 +58,8 @@
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final MallShopApplyMapper mallShopApplyMapper;
private final MallRegisterAppealMapper mallRegisterAppealMapper;
+ private final MallMemberBankMapper mallMemberBankMapper;
+ private final MallAchieveRecordMapper mallAchieveRecordMapper;
@Value("${spring.profiles.active}")
@@ -81,10 +82,12 @@
}
String account = registerDto.getAccount();
- String code = registerDto.getCode();
- boolean flags = commonService.verifyCode(account, code);
- if(!flags) {
- throw new FebsException("验证码错误");
+ if (!"admin".equals(registerDto.getRegistType())) {
+ String code = registerDto.getCode();
+ boolean flags = commonService.verifyCode(account, code);
+ if (!flags) {
+ throw new FebsException("验证码错误");
+ }
}
mallMember = new MallMember();
@@ -103,6 +106,17 @@
if (inviteMember == null) {
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("邀请码不能推广");
+// }
mallMember.setReferrerId(registerDto.getInviteId());
@@ -110,7 +124,7 @@
mallMember.setName(registerDto.getName());
mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
- mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
+ mallMember.setLevel(MemberLevelEnum.FANS.name());
mallMember.setSex("男");
mallMember.setBindPhone(registerDto.getAccount());
@@ -222,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())) {
@@ -236,16 +252,22 @@
if (payment != null) {
mallMemberVo.setHasPayment(1);
}
-
- DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL, mallMember.getLevel());
- if (dic != null) {
- mallMemberVo.setLevelName(dic.getDescription());
- }
+ 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.setEquityLimit(wallet.getEquityLimit());
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);
}
@@ -314,23 +336,18 @@
MallMember mallMember = this.baseMapper.selectById(memberId);
List<TeamListVo> list = this.baseMapper.selectTeamListByInviteId(mallMember.getInviteId());
-// BigDecimal ownAmount = this.baseMapper.selectOwnOrderAmountByInviteId(mallMember.getInviteId());
-// TeamListVo own = new TeamListVo();
-// own.setCreatedTime(mallMember.getCreatedTime());
-// own.setAmount(ownAmount);
-// own.setName(mallMember.getName());
-// own.setPhone(mallMember.getPhone());
-// own.setInviteId(mallMember.getInviteId());
-// own.setIsCurrent(1);
-// own.setCnt(this.baseMapper.selectOwnCntByInviteId(mallMember.getInviteId()));
-// own.setOrderCnt(this.baseMapper.selectOwnOrderCntByInviteId(mallMember.getInviteId()));
-// own.setId(mallMember.getId());
+ if(CollUtil.isNotEmpty(list)){
+ for(TeamListVo teamListVo : list){
+ String levelDescription = MemberLevelEnum.NORMAL.getLevelDescription(teamListVo.getLevel());
+ teamListVo.setLevelName(levelDescription);
+ }
+ }
MyTeamVo myTeamVo = new MyTeamVo();
myTeamVo.setTeam(list);
myTeamVo.setMyAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 1));
myTeamVo.setMyTeamAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 2));
- myTeamVo.setMyTeamCnt(list.size());
+ myTeamVo.setMyTeamCnt(this.baseMapper.selectAllChildAgentListByInviteId(mallMember.getInviteId()).size());
return new FebsResponse().success().data(myTeamVo);
}
@@ -385,13 +402,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
@@ -429,16 +457,15 @@
}
@Override
- public BigDecimal canMoney() {
+ public BigDecimal canMoney(int type) {
Long memberId = LoginUserUtil.getLoginUser().getId();
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
- BigDecimal profit = mallMoneyFlowMapper.selectProfitByDateAndMemberId(memberId);
-
- BigDecimal canMoney = wallet.getBalance();
- if (profit != null) {
- if(canMoney.compareTo(BigDecimal.ZERO) > 0) {
- canMoney = canMoney.subtract(profit);
- }
+ BigDecimal canMoney = BigDecimal.ZERO;
+ if(1 == type){
+ canMoney = wallet.getBalance();
+ }
+ if(2 == type){
+ canMoney = wallet.getScore();
}
return canMoney;
}
@@ -479,11 +506,15 @@
}
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(id);
+ commissionVo.setCommissionBalance(wallet.getBalance());
+ commissionVo.setCommissionScore(wallet.getScore());
commissionVo.setCommission(wallet.getCommission());
- commissionVo.setToday(mallMoneyFlowMapper.selectCommissionIncome(1, new Date(), id));
- commissionVo.setMonth(mallMoneyFlowMapper.selectCommissionIncome(2, new Date(), id));
- commissionVo.setTotal(mallMoneyFlowMapper.selectCommissionIncome(null, null, id));
- commissionVo.setWaitCommission(BigDecimal.ZERO);
+ 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));
+ commissionVo.setTodayScore(mallMoneyFlowMapper.selectCommissionIncome(2, 1,new Date(), id));
+ commissionVo.setMonthScore(mallMoneyFlowMapper.selectCommissionIncome(2, 2,new Date(), id));
+ commissionVo.setTotalScore(mallMoneyFlowMapper.selectCommissionIncome(2, null,null, id));
return commissionVo;
}
@@ -494,7 +525,7 @@
MallShopApply hasApply = mallShopApplyMapper.selectNewestApplyByMemberId(member.getId());
if (hasApply != null) {
if (!hasApply.getStatus().equals(MallShopApply.APPLY_DISAGREE)) {
- throw new FebsException("审核中或审核已通过");
+ throw new FebsException("请勿重复提交申请");
}
}
@@ -527,4 +558,78 @@
mallRegisterAppealMapper.insert(isExist);
}
+
+ @Override
+ public CashOutSettingVo cashOutSetting() {
+ CashOutSettingVo cashOutSettingVo = new CashOutSettingVo();
+ DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.CASHOUT_SETTING.getType(), DataDictionaryEnum.CASHOUT_SETTING.getCode());
+ if (dic != null) {
+ cashOutSettingVo = JSONObject.parseObject(dic.getValue(), CashOutSettingVo.class);
+ }
+ return cashOutSettingVo;
+ }
+
+ @Override
+ public List<ShopListVo> findShopListVo(ShopListDto shopListDto) {
+ Page<MallShopApply> page = new Page<>(shopListDto.getPageNow(), shopListDto.getPageSize());
+
+ MallShopApply shopApply = new MallShopApply();
+ shopApply.setStatus(MallShopApply.APPLY_AGREE);
+ IPage<MallShopApply> pageResult = mallShopApplyMapper.selectShopApplyInPage(shopApply, page);
+
+ List<MallShopApply> list = pageResult.getRecords();
+ if (CollUtil.isEmpty(list)) {
+ list = new ArrayList<>();
+ }
+ return MallShopApplyConversion.INSTANCE.entitiesToVOs(list);
+ }
+
+ @Override
+ @Transactional
+ public FebsResponse addMemberBank(AddMemberBankDto addMemberBankDto) {
+ MallMember member = LoginUserUtil.getLoginUser();
+ MallMemberBank mallMemberBank = MallMemberBankConversion.INSTANCE.dtoToentity(addMemberBankDto);
+ mallMemberBank.setMemberId(member.getId());
+ mallMemberBankMapper.insert(mallMemberBank);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse findMemberBankList(MemberBankListDto memberBankListDto) {
+ MallMember member = LoginUserUtil.getLoginUser();
+ Page<MemberBankListVo> page = new Page<>(memberBankListDto.getPageNum(), memberBankListDto.getPageSize());
+ memberBankListDto.setMemberId(member.getId());
+ IPage<MemberBankListVo> pageResult = mallMemberBankMapper.findMemberBankListInPage(memberBankListDto, page);
+ return new FebsResponse().success().data(pageResult);
+ }
+
+ @Override
+ public FebsResponse findBankDetailsById(Long id) {
+ MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(id);
+ MemberBankListVo memberBankListVo = MallMemberBankConversion.INSTANCE.entityToVo(mallMemberBank);
+ return new FebsResponse().success().data(memberBankListVo);
+ }
+
+ @Override
+ @Transactional
+ 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());
+ mallMemberBank.setBankName(updateMemberBankDto.getBankName());
+ mallMemberBank.setBankNameS(updateMemberBankDto.getBankNameS());
+ mallMemberBankMapper.updateById(mallMemberBank);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ @Transactional
+ public FebsResponse delMemberBank(Long id) {
+ mallMemberBankMapper.deleteById(id);
+ return new FebsResponse().success();
+ }
}
--
Gitblit v1.9.1