Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

xiaoyong931011

2021-09-29 1d0743632c39e137873960fcc76182943622719d

 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java

@@ -2,19 +2,17 @@

import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallMoneyFlow;
import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.mall.mapper.MallMemberPaymentMapper;
import cc.mrbird.febs.mall.mapper.MallMoneyFlowMapper;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.entity.MallNewsInfo;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.vo.*;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -25,6 +23,7 @@
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
@@ -34,6 +33,7 @@
@Slf4j
@Service
@RequiredArgsConstructor
@Transactional
public class AdminMallMemberServiceImpl extends ServiceImpl<MallMemberMapper, MallMember> implements IAdminMallMemberService {

    private final MallMemberMapper mallMemberMapper;
@@ -45,6 +45,10 @@
    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;

    private final IApiMallMemberWalletService iApiMallMemberWalletService;

    private final AppVersionMapper appVersionMapper;

    private final MallNewsInfoMapper mallNewsInfoMapper;

    @Override
    public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) {
@@ -252,4 +256,126 @@
        return new FebsResponse().success();
    }

    @Override
    public IPage<AppVersion> getAppVersionList(AppVersion appVersion, QueryRequest request) {
        Page<AppVersion> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<AppVersion> appVersions = this.baseMapper.getAppVersionListInPage(page, appVersion);
        return appVersions;
    }

    @Override
    public FebsResponse delCategary(Long id) {
        AppVersion appVersion = appVersionMapper.selectById(id);
        if(ObjectUtil.isEmpty(appVersion)){
            return new FebsResponse().fail().message("系统繁忙，请刷新页面重试");
        }
        appVersionMapper.deleteById(id);
        return new FebsResponse().success();
    }

    @Override
    public FebsResponse addAppVersion(AppVersion appVersion) {
        appVersion.setCreatetime(new Date());
        appVersionMapper.insert(appVersion);
        return new FebsResponse().success();
    }

    @Override
    public AppVersion getAppVersionInfoById(long id) {
        return appVersionMapper.selectById(id);
    }

    @Override
    public FebsResponse updateAppVersion(AppVersion appVersion) {
        AppVersion appVersionBefore = appVersionMapper.selectById(appVersion.getId());
        if(ObjectUtil.isEmpty(appVersionBefore)){
            return new FebsResponse().fail().message("系统繁忙，请刷新页面重试");
        }
        appVersion.setCreatetime(new Date());
        appVersionMapper.updateById(appVersion);
        return new FebsResponse().success();
    }

    @Override
    public FebsResponse activateAccount(Long id) {
        MallMember mallMember = mallMemberMapper.selectById(id);
        if(ObjectUtil.isEmpty(mallMember)){
            return new FebsResponse().fail().message("系统繁忙，请刷新页面重试");
        }
        String level = mallMember.getLevel();
        if(StrUtil.isEmpty(level) || !AgentLevelEnum.ZERO_LEVEL.name().equals(mallMember.getLevel())){
            return new FebsResponse().fail().message("该用户无法激活");
        }
        mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
        mallMemberMapper.updateById(mallMember);
        return new FebsResponse().success();
    }

    @Override
    public MallNewsInfo getNewsInfoById(long id) {
        return mallNewsInfoMapper.selectById(id);
    }

    @Override
    public IPage<AdminMallNewsInfoVo> getNewInfoList(MallNewsInfo mallNewsInfo, QueryRequest request) {
        Page<AdminMallNewsInfoVo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<AdminMallNewsInfoVo> adminMallNewsInfoVos = mallNewsInfoMapper.getNewInfoListInPage(page, mallNewsInfo);
        return adminMallNewsInfoVos;
    }

    @Override
    public FebsResponse addNewsInfo(MallNewsInfoDto mallNewsInfoDto) {
        Integer type = mallNewsInfoDto.getType();
        if(type == 2){
            Long goodsId = mallNewsInfoDto.getGoodsId()==null?0L:mallNewsInfoDto.getGoodsId();
            if(goodsId == 0L){
                return new FebsResponse().fail().message("请选择跳转的产品");
            }
        }
        MallNewsInfo mallNewsInfo = new MallNewsInfo();
        mallNewsInfo.setTitle(mallNewsInfoDto.getTitle());
        mallNewsInfo.setContent(mallNewsInfoDto.getContent());
        mallNewsInfo.setType(mallNewsInfoDto.getType());
        if(mallNewsInfoDto.getType() == 2){
            mallNewsInfo.setTargetId(mallNewsInfoDto.getGoodsId());
        }
        mallNewsInfoMapper.insert(mallNewsInfo);
        return new FebsResponse().success();
    }

    @Override
    public FebsResponse delNewsInfo(Long id) {
        MallNewsInfo mallNewsInfo = mallNewsInfoMapper.selectById(id);
        if(ObjectUtil.isEmpty(mallNewsInfo)){
            return new FebsResponse().fail().message("系统繁忙，请刷新页面重试");
        }
        mallNewsInfoMapper.deleteById(id);
        return new FebsResponse().success();
    }

    @Override
    public FebsResponse updateNewsInfo(MallNewsInfoDto mallNewsInfoDto) {
        MallNewsInfo mallNewsInfoBefore = mallNewsInfoMapper.selectById(mallNewsInfoDto.getId());
        if(ObjectUtil.isEmpty(mallNewsInfoBefore)){
            return new FebsResponse().fail().message("系统繁忙，请刷新页面重试");
        }
        Integer type = mallNewsInfoDto.getType();
        if(type == 2){
            Long goodsId = mallNewsInfoDto.getGoodsId()==null?0L:mallNewsInfoDto.getGoodsId();
            if(goodsId == 0L){
                return new FebsResponse().fail().message("请选择跳转的产品");
            }
        }
        MallNewsInfo mallNewsInfo = new MallNewsInfo();
        mallNewsInfo.setTitle(mallNewsInfoDto.getTitle());
        mallNewsInfo.setContent(mallNewsInfoDto.getContent());
        mallNewsInfo.setType(mallNewsInfoDto.getType());
        if(mallNewsInfoDto.getType() == 2){
            mallNewsInfo.setTargetId(mallNewsInfoDto.getGoodsId());
        }
        mallNewsInfoMapper.insert(mallNewsInfo);
        mallNewsInfoMapper.deleteById(mallNewsInfoDto.getId());
        return new FebsResponse().success();
    }

}