Pu Zhibing
2025-03-11 1baa968ec54ff2a0f08bdeb6e8cebd987754ed74
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -637,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();
        }
@@ -954,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":
                            // 仅个人数据 查询当前登陆人关联店铺下的用户
@@ -962,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;
                    }
                }
@@ -1232,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>