From b0b52cbabf7a4bc8e00fc328d14ac05336d0221e Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 15 七月 2023 20:07:44 +0800
Subject: [PATCH] 员工端
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 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 cf95a7c..2dbd752 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
@@ -84,8 +84,6 @@
@Resource
private RemoteOrderService orderService;
- @Resource
- private MemberNurseService memberNurseService;
@Resource
private RemoteConfigService remoteConfigService;
@@ -325,27 +323,22 @@
switch (editType) {
case 1:
member.setNickName(editValue);
- member.setUpdateTime(new Date());
- member.setUpdateUserId(appEditUserDto.getUserId());
- this.saveOrUpdate(member);
break;
case 2:
+ member.setAvatar(editValue);
break;
case 3:
member.setGender(Integer.valueOf(editValue));
- member.setUpdateTime(new Date());
- member.setUpdateUserId(appEditUserDto.getUserId());
- this.saveOrUpdate(member);
break;
case 4:
member.setBirthday(editValue);
- member.setUpdateTime(new Date());
- member.setUpdateUserId(appEditUserDto.getUserId());
- this.saveOrUpdate(member);
break;
default:
break;
}
+ member.setUpdateTime(new Date());
+ member.setUpdateUserId(appEditUserDto.getUserId());
+ this.saveOrUpdate(member);
sysUserService.editUserInfo(appEditUserDto);
}
@@ -1152,6 +1145,12 @@
nurseTotalVos = listRemoveNull(nurseTotalVos);
mgtTotalMemberTotalVo.setNurseTotalVos(nurseTotalVos);
}
+ //获取不同等级的会员数
+ List<MgtMapIntTotalVo> memberLevelTotalVos = memberMapper.getTotalMemberTotalLevel(mgtBaseShopDto);
+ if (memberLevelTotalVos != null && memberLevelTotalVos.size() > 0) {
+ memberLevelTotalVos = listRemoveNull(memberLevelTotalVos);
+ mgtTotalMemberTotalVo.setMemberLevelTotalVos(memberLevelTotalVos);
+ }
// 获取不同商品类型的会员数
List<MgtMapIntTotalVo> goodsTypeTotalVos = memberMapper.getTotalMemberTotalGoodsType(mgtBaseShopDto);
if (goodsTypeTotalVos != null && goodsTypeTotalVos.size() > 0) {
@@ -1257,6 +1256,12 @@
if (nurseTotalVos != null && nurseTotalVos.size() > 0) {
nurseTotalVos = listRemoveNull(nurseTotalVos);
plTotalMemberTotalVo.setNurseTotalVos(nurseTotalVos);
+ }
+ //获取不同等级的会员数
+ List<MgtMapIntTotalVo> memberLevelTotalVos = memberMapper.getPlTotalMemberTotalLevel(mgtBasePlatformDto);
+ if (memberLevelTotalVos != null && memberLevelTotalVos.size() > 0) {
+ memberLevelTotalVos = listRemoveNull(memberLevelTotalVos);
+ plTotalMemberTotalVo.setMemberLevelTotalVos(memberLevelTotalVos);
}
// 获取不同商品类型的会员数
List<MgtMapIntTotalVo> goodsTypeTotalVos = memberMapper.getPlTotalMemberTotalGoodsType(mgtBasePlatformDto);
@@ -1513,6 +1518,12 @@
if (nurseTotalVos != null && nurseTotalVos.size() > 0) {
nurseTotalVos = listRemoveNull(nurseTotalVos);
memberFixedTotalVo.setNurseTotalVos(nurseTotalVos);
+ }
+ //获取不同等级的会员数
+ List<MgtMapIntTotalVo> memberLevelTotalVos = memberMapper.getMerMemberTotalLevel(merTotalDto);
+ if (memberLevelTotalVos != null && memberLevelTotalVos.size() > 0) {
+ memberLevelTotalVos = listRemoveNull(memberLevelTotalVos);
+ memberFixedTotalVo.setMemberLevelTotalVos(memberLevelTotalVos);
}
// 获取不同商品类型的会员数
List<MgtMapIntTotalVo> goodsTypeTotalVos = memberMapper.getMerMemberTotalGoodsType(merTotalDto);
@@ -1815,4 +1826,16 @@
integralRecordService.saveOrUpdate(integralRecord);
return completeFlag;
}
+
+ /**
+ * @description 统计商户今日新增会员
+ * @author jqs
+ * @date 2023/7/14 19:54
+ * @param shopIdList
+ * @return Integer
+ */
+ @Override
+ public Integer getAreaNewMember(List<Long> shopIdList){
+ return memberMapper.getAreaNewMember(shopIdList);
+ }
}
--
Gitblit v1.7.1