修改

xuhy

2024-10-25 6aa659f6cb7d3c86c87c4ab58be4220820c7326b

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java

@@ -2,16 +2,22 @@

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.system.domain.TFoundationConfig;
import com.ruoyi.system.domain.TFoundationPerson;
import com.ruoyi.system.dto.TFoundationPersonDTO;
import com.ruoyi.system.mapper.TFoundationPersonMapper;
import com.ruoyi.system.query.TFoundationPersonQuery;
import com.ruoyi.system.service.TFoundationConfigService;
import com.ruoyi.system.service.TFoundationPersonService;
import com.ruoyi.system.vo.SysUserVO;
import com.ruoyi.system.vo.TFoundationPersonVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;

@@ -31,10 +37,22 @@

    @Override
    public void add(TFoundationPersonDTO dto) {

        long count1 = this.count(Wrappers.lambdaQuery(TFoundationPerson.class)
                .eq(TFoundationPerson::getShopId, dto.getShopId())
                .eq(TFoundationPerson::getMealCount, dto.getMealCount()));
        if(count1>0){
            throw new ServiceException("该店铺已存在该用餐人数设置");
        }

        List<TFoundationConfig> foundationConfigs = dto.getFoundationConfigs();
        long count = foundationConfigs.stream().map(TFoundationConfig::getTypeId).distinct().count();
        if(foundationConfigs.size()!=count){
            throw new ServiceException("菜品重复设置");
        }
        // 添加人数
        this.save(dto);
        // 添加菜品
        List<TFoundationConfig> foundationConfigs = dto.getFoundationConfigs();
        foundationConfigs.forEach(item -> {
            item.setPersonId(dto.getId());
        });
@@ -43,13 +61,25 @@

    @Override
    public void edit(TFoundationPersonDTO dto) {
        long count1 = this.count(Wrappers.lambdaQuery(TFoundationPerson.class)
                .eq(TFoundationPerson::getShopId, dto.getShopId())
                .eq(TFoundationPerson::getMealCount, dto.getMealCount())
                .ne(TFoundationPerson::getId,dto.getId()));
        if(count1>0){
            throw new ServiceException("该店铺已存在该用餐人数设置");
        }

        List<TFoundationConfig> foundationConfigs = dto.getFoundationConfigs();
        long count = foundationConfigs.stream().map(TFoundationConfig::getTypeId).distinct().count();
        if(foundationConfigs.size()!=count){
            throw new ServiceException("菜品重复设置");
        }
        // 添加人数
        this.updateById(dto);
        // 删除菜品
        foundationConfigService.remove(Wrappers.lambdaQuery(TFoundationConfig.class)
                .eq(TFoundationConfig::getPersonId,dto.getId()));
        // 添加菜品
        List<TFoundationConfig> foundationConfigs = dto.getFoundationConfigs();
        foundationConfigs.forEach(item -> {
            item.setPersonId(dto.getId());
        });
@@ -57,14 +87,23 @@
    }

    @Override
    public List<TFoundationPersonVO> getList() {
        List<TFoundationPersonVO> list = this.baseMapper.getList();
    public PageInfo<TFoundationPersonVO> getList(TFoundationPersonQuery query) {
        PageInfo<TFoundationPersonVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TFoundationPersonVO> list = this.baseMapper.getList(query,pageInfo);
        List<Long> ids = list.stream().map(TFoundationPersonVO::getId).collect(Collectors.toList());
        List<TFoundationConfig> list1 = foundationConfigService.list(Wrappers.lambdaQuery(TFoundationConfig.class)
                .in(TFoundationConfig::getPersonId, ids));
        list.forEach(item -> {
            item.setFoundationConfigs(list1.stream().filter(item1 -> item1.getPersonId().equals(item.getId())).collect(Collectors.toList()));
        });
        return list;
        if(!CollectionUtils.isEmpty(ids)){
            List<TFoundationConfig> list1 = foundationConfigService.list(Wrappers.lambdaQuery(TFoundationConfig.class)
                    .in(TFoundationConfig::getPersonId, ids));
            list.forEach(item -> {
                List<TFoundationConfig> collect = list1.stream().filter(item1 -> item1.getPersonId().equals(item.getId())).collect(Collectors.toList());
                if(!CollectionUtils.isEmpty(collect)){
                    item.setMinDish(collect.stream().sorted(Comparator.comparingInt(TFoundationConfig::getMinCount)).findFirst().get().getMinCount());
                    item.setMaxDish(collect.stream().sorted(Comparator.comparingInt(TFoundationConfig::getMaxCount).reversed()).findFirst().get().getMaxCount());
                    item.setFoundationConfigs(collect);
                }
            });
        }
        pageInfo.setRecords(list);
        return pageInfo;
    }
}