From ed7cde0f64b01e95e11d6f66d1f27b05cea84332 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 09 七月 2023 18:13:00 +0800
Subject: [PATCH] 管理台bug和用户端
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
index a452f4d..58068a9 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -964,6 +964,7 @@
mgtMemberGetVo.setMemberNo(member.getMemberNo());
mgtMemberGetVo.setRealName(member.getRealName());
mgtMemberGetVo.setNickName(member.getNickName());
+ mgtMemberGetVo.setAvatar(member.getAvatar());
mgtMemberGetVo.setMobile(member.getMobile());
mgtMemberGetVo.setGender(member.getGender() == 0 ? "男" : member.getGender() == 1 ? "女" : null);
mgtMemberGetVo.setBirthday(member.getBirthday());
@@ -1401,6 +1402,18 @@
merTotalDto.setShopId(null);
}
MgtAgeTotalVo mgtAgeTotalVo = memberMapper.getMerMemberTotalAge(merTotalDto);
+ Integer manTotal = mgtAgeTotalVo.getManTotal();
+ Integer womenTotal = mgtAgeTotalVo.getWomenTotal();
+ memberFixedTotalVo.setManTotal(manTotal);
+ memberFixedTotalVo.setWomenTotal(womenTotal);
+ Integer personTotal = manTotal + womenTotal;
+ BigDecimal manTotalBig = new BigDecimal(manTotal);
+ BigDecimal personTotalBig = new BigDecimal(personTotal);
+ BigDecimal bigTen = new BigDecimal("100.00");
+ BigDecimal menPercent = manTotalBig.divide(personTotalBig).setScale(0,BigDecimal.ROUND_HALF_UP);
+ BigDecimal womenPercent = bigTen.subtract(menPercent);
+ memberFixedTotalVo.setManPercent(menPercent);
+ memberFixedTotalVo.setWomenPercent(womenPercent);
// 年龄段数组
String[] ageKey = {"<20", "21-30", "31-40", "41-50", ">50"};
// 不同年龄段的会员数数组
@@ -1419,6 +1432,12 @@
if (goodsTypeTotalVos != null && goodsTypeTotalVos.size() > 0) {
goodsTypeTotalVos = listRemoveNull(goodsTypeTotalVos);
memberFixedTotalVo.setGoodsTypeTotalVos(goodsTypeTotalVos);
+ }
+ //获取会员消费排名
+ List<MgtMapIntTotalVo> memberPayList = memberMapper.getMerMemberPayRank(merTotalDto);
+ if (memberPayList != null && memberPayList.size() > 0) {
+ memberPayList = listRemoveNull(memberPayList);
+ memberFixedTotalVo.setMemberPayList(memberPayList);
}
// 获取不同活跃度的会员数
List<Activeness> activenessList = remoteConfigService.listActiveness().getData();
@@ -1443,12 +1462,6 @@
MgtMapIntTotalVoList.add(MgtMapIntTotalVo);
}
memberFixedTotalVo.setActivenessList(MgtMapIntTotalVoList);
- }
- //获取会员消费排名
- List<MgtMapIntTotalVo> memberPayList = memberMapper.getMerMemberPayRank(merTotalDto);
- if (memberPayList != null && memberPayList.size() > 0) {
- memberPayList = listRemoveNull(memberPayList);
- memberFixedTotalVo.setMemberPayList(memberPayList);
}
return memberFixedTotalVo;
}
@@ -1544,4 +1557,16 @@
orderAgeUserVoList.add(merOrderAgeUserVo);
return orderAgeUserVoList;
}
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/7/5 21:18
+ * @param mgtBaseGetDto
+ * @return void
+ */
+ @Override
+ public void mgtFrozenMember(MgtBaseGetDto mgtBaseGetDto){
+ sysUserService.frozenUser(Long.valueOf(mgtBaseGetDto.getId()));
+ }
}
--
Gitblit v1.7.1