bugfixed

CeDo

2021-05-20 a8e77d738952c6e231769a4112fce7299eb4f56c

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java

@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -24,10 +25,7 @@
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -69,6 +67,9 @@
    public R addComCvtServe(ComCvtServeDTO comCvtServeDTO) {
        ComCvtServeDO comCvtServeDO = new ComCvtServeDO();
        BeanUtils.copyProperties(comCvtServeDTO, comCvtServeDO);
        if(checkRepeat(comCvtServeDO)){
            return R.fail("服务已存在");
        }
        int insert = comCvtServeDAO.insert(comCvtServeDO);
        if (insert > 0) {
            return R.ok();
@@ -82,8 +83,12 @@
        if (null == comCvtServeDO) {
            return R.fail("该服务不存在");
        }
        BeanUtils.copyProperties(comCvtServeDTO, comCvtServeDO);
        int update = comCvtServeDAO.updateById(comCvtServeDO);
        ComCvtServeDO comCvtServeDO2 = new ComCvtServeDO();
        BeanUtils.copyProperties(comCvtServeDTO, comCvtServeDO2);
        if(!comCvtServeDO.equals(comCvtServeDO2) && checkRepeat(comCvtServeDO2)){
            return R.fail("该服务与其他服务重复");
        }
        int update = comCvtServeDAO.updateById(comCvtServeDO2);
        if (update > 0) {
            return R.ok();
        }
@@ -166,22 +171,47 @@
        if (null != communityId && communityId != 0) {
            comCvtBusinessDOS = comCvtBusinessDAO.selectList(new QueryWrapper<ComCvtBusinessDO>().lambda().eq(ComCvtBusinessDO::getCommunityId, communityId));
        } else {
            comCvtBusinessDOS = comCvtBusinessDAO.selectList(null);
            comCvtBusinessDOS = comCvtBusinessDAO.selectList(new LambdaQueryWrapper<>());
        }
        Map<String, Long> businessMap = getBusinessMap(comCvtBusinessDOS);
        List<String> errorInfo = new ArrayList<>();
        list.forEach(comCvtServeExcelVO -> {
            /**
             * 便民服务分类存在 并且 便民服务商家 匹配上
             */
            if (categoryMap.containsKey(comCvtServeExcelVO.getCategoryName()) && businessMap.containsKey(comCvtServeExcelVO.getBusinessName())) {
                ComCvtServeDO comCvtServeDO = new ComCvtServeDO();
                BeanUtils.copyProperties(comCvtServeExcelVO, comCvtServeDO);
                comCvtServeDO.setCategoryId(categoryMap.get(comCvtServeExcelVO.getCategoryName()));
                comCvtServeDO.setBusinessId(businessMap.get(comCvtServeExcelVO.getBusinessName()));
                comCvtServeDOS.add(comCvtServeDO);
                //检查商家是否已有某服务
                if(!checkRepeat(comCvtServeDO)){
                    comCvtServeDOS.add(comCvtServeDO);
                }else{
                    log.error(String.format("导入失败：商家【%s】下已有服务【%s】",comCvtServeExcelVO.getBusinessName(),comCvtServeExcelVO.getServiceName()));
                }
            }else{
                if(!categoryMap.containsKey(comCvtServeExcelVO.getCategoryName())) {
                    errorInfo.add(comCvtServeExcelVO.getCategoryName() +"导入失败: 服务分类不存在");
                }
                if(!businessMap.containsKey(comCvtServeExcelVO.getBusinessName())) {
                    errorInfo.add(comCvtServeExcelVO.getBusinessName() +"导入失败: 便民服务商家不存在");
                }
            }
        });
        this.saveBatch(comCvtServeDOS);
        return R.ok();
        boolean saveBatched = this.saveBatch(comCvtServeDOS);
        if(saveBatched) {
            if (comCvtServeDOS.size()>0 && errorInfo != null && errorInfo.size() > 0) {
                return R.fail("导入部分成功：" + errorInfo.toString());
            }
            if(comCvtServeDOS.size()==0  && errorInfo != null && errorInfo.size() > 0){
                return R.fail("导入失败：" + errorInfo.toString());
            }
        }
        return R.ok("共计导入服务数量："+comCvtServeDOS.size());
    }

    //获取分类集合
    private Map<String, Long> getCategoryMap(List<ComCvtCategoryDO> categoryDOS) {
        Map<String, Long> categoryMap = new HashMap<>();
        if (!ObjectUtils.isEmpty(categoryDOS)) {
@@ -192,6 +222,7 @@
        return categoryMap;
    }

    //获取商家集合
    private Map<String, Long> getBusinessMap(List<ComCvtBusinessDO> comCvtBusinessDOS) {
        Map<String, Long> businessMap = new HashMap<>();
        if (!ObjectUtils.isEmpty(comCvtBusinessDOS)) {
@@ -201,4 +232,20 @@
        }
        return businessMap;
    }

    /**
     * 检查服务是否重复 商家名称、分类名称，服务名称、服务价格、服务描述不能同时重复
     * @param comCvtServeDO
     * @return
     */
    private boolean checkRepeat(ComCvtServeDO comCvtServeDO){
        Integer count = comCvtServeDAO.selectCount(new QueryWrapper<ComCvtServeDO>().lambda()
                .eq(ComCvtServeDO::getBusinessId,comCvtServeDO.getBusinessId())
                .and(wrapper->wrapper.eq(ComCvtServeDO::getCategoryId,comCvtServeDO.getCategoryId()))
                .and(wrapper->wrapper.eq(ComCvtServeDO::getServiceName,comCvtServeDO.getServiceName()))
                .and(wrapper->wrapper.eq(ComCvtServeDO::getServicePrice,comCvtServeDO.getServicePrice()))
                .and(wrapper->wrapper.eq(ComCvtServeDO::getServiceDesc,comCvtServeDO.getServiceDesc()))
        );
        return count>0 ? true : false;
    }
}