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 | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 b1fdab9..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
@@ -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);
}
@@ -609,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