From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 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 62a2f96..bd779ac 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
@@ -115,6 +115,12 @@
@Resource
private RemoteOrderService remoteOrderService;
+ @Resource
+ private RemoteUserService remoteUserService;
+
+
+
+
/**
* @description: TODO
* @author jqs34
@@ -631,6 +637,7 @@
if (oldMember != null && oldMember.getBindingFlag() == 0) {
oldMember.setRelationShopId(merMemberAddDto.getShopId());
oldMember.setBindingFlag(1);
+ oldMember.setBindingType(8);
this.updateById(oldMember);
return oldMember.getUserId();
}
@@ -948,7 +955,11 @@
List<Long> userIds = sysUserService.getUserIdsByDept(sysUser.getUserId()).getData();
// 获取店铺ids
List<Long> data = shopService.getShopIdsByUserIds(userIds).getData();
- scope.addAll(data);
+ if (data.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data);
+ }
break;
case "5":
// 仅个人数据 查询当前登陆人关联店铺下的用户
@@ -956,7 +967,12 @@
longs.add(sysUser.getUserId());
// 获取店铺ids
List<Long> data1 = shopService.getShopIdsByUserIds(longs).getData();
- scope.addAll(data1);
+ if (data1.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data1);
+ }
+
break;
}
}
@@ -1226,6 +1242,13 @@
return memberMapper.listIdBySendType(sendType,shopId);
}
+
+ public List<Long> listIdBySendType2(Long shopId) {
+ //1.手动领取2.全部用户3.会员用户4非会员用户5自定义
+ return memberMapper.listIdBySendType2(shopId);
+ }
+
+
/**
* @param userIds
* @return List<MgtSimpleMemberVo>
@@ -1266,10 +1289,10 @@
* @date 2023/6/18 16:45
*/
@Override
- public MgtBulletinBoardVo boardMemberTotal() {
+ public MgtBulletinBoardVo boardMemberTotal(List<Long> shopIds) {
MgtBulletinBoardVo mgtBulletinBoardVo = new MgtBulletinBoardVo();
- mgtBulletinBoardVo.setMemberTotal(memberMapper.memberTotal());
- mgtBulletinBoardVo.setMemberToday(memberMapper.memberToday());
+ mgtBulletinBoardVo.setMemberTotal(memberMapper.memberTotal(shopIds));
+ mgtBulletinBoardVo.setMemberToday(memberMapper.memberToday(shopIds));
return mgtBulletinBoardVo;
}
@@ -1461,13 +1484,14 @@
plTotalMemberTotalVo.setShopMemberRankList(Lists.newArrayList());
Date nowDay = DateUtils.getNowDate();
//如果区域代码不为null获取对应的商户id
+ List<Long> list = new ArrayList<>();
if (StringUtils.isNotBlank(mgtBasePlatformDto.getShopProvinceCode()) || StringUtils.isNotBlank(mgtBasePlatformDto.getShopCityCode()) || StringUtils.isNotBlank(mgtBasePlatformDto.getShopAreaCode())) {
MgtShopIdByCodeDto mgtShopIdByCodeDto = new MgtShopIdByCodeDto();
mgtShopIdByCodeDto.setShopProvinceCode(mgtBasePlatformDto.getShopProvinceCode());
mgtShopIdByCodeDto.setShopCityCode(mgtBasePlatformDto.getShopCityCode());
mgtShopIdByCodeDto.setShopAreaCode(mgtBasePlatformDto.getShopAreaCode());
MgtShopIdByCodeVo mgtShopIdByCodeVo = remoteShopService.getShopIdByCode(mgtShopIdByCodeDto).getData();
- List<Long> list = new ArrayList<>();
+
if (StringUtils.isNotBlank(mgtShopIdByCodeVo.getShopIds())) {
list = Arrays.stream(mgtShopIdByCodeVo.getShopIds().split(","))
.map(Long::valueOf)
@@ -1475,8 +1499,17 @@
}else{
return plTotalMemberTotalVo;
}
- mgtBasePlatformDto.setShopIdList(list);
}
+ //数据权限
+ List<Long> userId = remoteUserService.getScopeOfAuthorityUserId();
+ BoardMemberTotalDto boardMemberTotalDto = new BoardMemberTotalDto();
+ boardMemberTotalDto.setUserIds(userId);
+ List<Shop> shops = remoteShopService.getShopBySysUserIds(boardMemberTotalDto);
+ List<Long> collect = shops.stream().map(Shop::getShopId).collect(Collectors.toList());
+ list.addAll(collect);
+ mgtBasePlatformDto.setShopIdList(list);
+
+
//获取基础统计
MgtPlTotalMemberTotalVo plTotalMemberTotalByDayVo = memberMapper.getPlTotalMemberTotal(mgtBasePlatformDto);
plTotalMemberTotalVo.setMemberTotal(plTotalMemberTotalByDayVo.getMemberTotal());
--
Gitblit v1.7.1