合并代码

puzhibing

2024-03-18 0b956579c125f41f27d1e09ecae5853926ef19fe

 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
@@ -1235,6 +1241,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>
@@ -1275,10 +1288,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;
    }

@@ -1470,13 +1483,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)
@@ -1484,8 +1498,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());