管理台bug和用户端生日卡

jiangqs

2023-07-07 5627daeb1ac1a29947e902f9a7efb6730ed98611

 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());
@@ -1388,6 +1389,11 @@
     */
    @Override
    public MerMemberFixedTotalVo getMerMemberFixedTotal(MerTotalDto merTotalDto){
        if(merTotalDto.getShopAllFlag()!=null&&merTotalDto.getShopAllFlag()==1){
            List<Long> shopIdList = remoteShopService.listShopIdByShopId(merTotalDto.getShopId()).getData();
            merTotalDto.setShopIdList(shopIdList);
            merTotalDto.setShopId(null);
        }
        MerMemberFixedTotalVo memberFixedTotalVo = new MerMemberFixedTotalVo();
        Date nowDay = DateUtils.getNowDate();
        if(merTotalDto.getShopAllFlag()!=null&&merTotalDto.getShopAllFlag()==1){
@@ -1457,6 +1463,11 @@
     */
    @Override
    public MerMemberSourceTotalVo getMerMemberSourceTotal(MerTotalDto merTotalDto){
        if(merTotalDto.getShopAllFlag()!=null&&merTotalDto.getShopAllFlag()==1){
            List<Long> shopIdList = remoteShopService.listShopIdByShopId(merTotalDto.getShopId()).getData();
            merTotalDto.setShopIdList(shopIdList);
            merTotalDto.setShopId(null);
        }
        MerMemberSourceTotalVo memberSourceTotalVo = new MerMemberSourceTotalVo();
        //获取来源渠道排名
        List<MgtMapIntTotalVo> customerSourceList = memberMapper.getMerMemberCustomerSourceRank(merTotalDto);
@@ -1477,6 +1488,11 @@
     */
    @Override
    public MerMemberRecommendTotalVo getMerMemberRecommendTotal(MerTotalDto merTotalDto){
        if(merTotalDto.getShopAllFlag()!=null&&merTotalDto.getShopAllFlag()==1){
            List<Long> shopIdList = remoteShopService.listShopIdByShopId(merTotalDto.getShopId()).getData();
            merTotalDto.setShopIdList(shopIdList);
            merTotalDto.setShopId(null);
        }
        MerMemberRecommendTotalVo memberRecommendTotalVo = new MerMemberRecommendTotalVo();
        //获取会员推荐排名
        List<MgtMapIntTotalVo> recommendList = memberMapper.getMerMemberRecommendRank(merTotalDto);
@@ -1486,4 +1502,59 @@
        }
        return memberRecommendTotalVo;
    }

    /**
     * @description  获取各年龄层用户
     * @author  jqs
     * @date    2023/7/4 9:50
     * @param merTotalDto
     * @return  MerOrderAgeUserVo
     */
    @Override
    public List<MerOrderAgeUserVo> listOrderAgeUser(MerTotalDto merTotalDto){
        List<MerOrderAgeUserVo> orderAgeUserVoList = new ArrayList<>();
        MerOrderAgeUserVo merOrderAgeUserVo = new MerOrderAgeUserVo();
        merTotalDto.setAgeType(1);
        List<Long> userIdList = memberMapper.listOrderAgeUser(merTotalDto);
        merOrderAgeUserVo.setAgeType(1);
        merOrderAgeUserVo.setUserIdList(userIdList);
        orderAgeUserVoList.add(merOrderAgeUserVo);
        merOrderAgeUserVo = new MerOrderAgeUserVo();
        merTotalDto.setAgeType(2);
        userIdList = memberMapper.listOrderAgeUser(merTotalDto);
        merOrderAgeUserVo.setAgeType(2);
        merOrderAgeUserVo.setUserIdList(userIdList);
        orderAgeUserVoList.add(merOrderAgeUserVo);
        merOrderAgeUserVo = new MerOrderAgeUserVo();
        merTotalDto.setAgeType(3);
        userIdList = memberMapper.listOrderAgeUser(merTotalDto);
        merOrderAgeUserVo.setAgeType(3);
        merOrderAgeUserVo.setUserIdList(userIdList);
        orderAgeUserVoList.add(merOrderAgeUserVo);
        merOrderAgeUserVo = new MerOrderAgeUserVo();
        merTotalDto.setAgeType(4);
        userIdList = memberMapper.listOrderAgeUser(merTotalDto);
        merOrderAgeUserVo.setAgeType(4);
        merOrderAgeUserVo.setUserIdList(userIdList);
        orderAgeUserVoList.add(merOrderAgeUserVo);
        merOrderAgeUserVo = new MerOrderAgeUserVo();
        merTotalDto.setAgeType(5);
        userIdList = memberMapper.listOrderAgeUser(merTotalDto);
        merOrderAgeUserVo.setAgeType(4);
        merOrderAgeUserVo.setUserIdList(userIdList);
        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()));
    }
}