Merge branch 'test' into 'lyq'

罗元桥

2021-05-25 543aecbc143b113e81c887a3a7ebb72213faf5bd

 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.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,6 +12,7 @@
import com.panzhihua.common.model.vos.community.ComCvtBusinessCategoryServeVO;
import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
import com.panzhihua.common.model.vos.community.ComCvtServeVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationImportErrorVO;
import com.panzhihua.service_community.dao.ComCvtBusinessAreaDAO;
import com.panzhihua.service_community.dao.ComCvtBusinessDAO;
import com.panzhihua.service_community.dao.ComCvtCategoryDAO;
@@ -165,6 +167,7 @@
    @Override
    public R listSaveConvenientServeExcelVO(List<ComCvtServeExcelVO> list, Long communityId) {
        List<ComCvtServeDO> comCvtServeDOS = new ArrayList<>();
        List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
        List<ComCvtCategoryDO> categoryDOS = comCvtCategoryDAO.selectList(new QueryWrapper<ComCvtCategoryDO>().lambda().orderByDesc(ComCvtCategoryDO::getWeight));
        Map<String, Long> categoryMap = getCategoryMap(categoryDOS);
        List<ComCvtBusinessDO> comCvtBusinessDOS;
@@ -174,7 +177,9 @@
            comCvtBusinessDOS = comCvtBusinessDAO.selectList(new LambdaQueryWrapper<>());
        }
        Map<String, Long> businessMap = getBusinessMap(comCvtBusinessDOS);
        list.forEach(comCvtServeExcelVO -> {
        int index = 2;
        for (ComCvtServeExcelVO comCvtServeExcelVO:list) {

            /**
             * 便民服务分类存在 并且 便民服务商家 匹配上
             */
@@ -187,11 +192,40 @@
                if(!checkRepeat(comCvtServeDO)){
                    comCvtServeDOS.add(comCvtServeDO);
                }else{
                    ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                    importErrorVO.setErrorMsg(String.format("导入失败：商家【%s】下已有服务【%s】",comCvtServeExcelVO.getBusinessName(),comCvtServeExcelVO.getServiceName()));
                    importErrorVO.setErrorPosition("第" + index + "行");
                    populationImportErrorVOList.add(importErrorVO);
                    log.error(String.format("导入失败：商家【%s】下已有服务【%s】",comCvtServeExcelVO.getBusinessName(),comCvtServeExcelVO.getServiceName()));
                }
            }else{
                if(!categoryMap.containsKey(comCvtServeExcelVO.getCategoryName())) {
                    ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                    importErrorVO.setErrorMsg("导入失败: 服务分类" + comCvtServeExcelVO.getCategoryName() +"不存在");
                    importErrorVO.setErrorPosition("第" + index + "行，第1列");
                    populationImportErrorVOList.add(importErrorVO);
//                    errorInfo.add(comCvtServeExcelVO.getCategoryName() +"导入失败: 服务分类不存在");
            }
        });
        this.saveBatch(comCvtServeDOS);
                if(!businessMap.containsKey(comCvtServeExcelVO.getBusinessName())) {
                    ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                    importErrorVO.setErrorMsg("导入失败: 便民服务商家" + comCvtServeExcelVO.getBusinessName() +"不存在");
                    importErrorVO.setErrorPosition("第" + index + "行，第5列");
                    populationImportErrorVOList.add(importErrorVO);
                }
            }
            index++;
        }
        boolean saveBatched = this.saveBatch(comCvtServeDOS);
        if(saveBatched) {
            if (comCvtServeDOS.size()>0 && populationImportErrorVOList.size() > 0) {
                return R.fail(JSON.toJSONString(populationImportErrorVOList));
            }
            if(comCvtServeDOS.size()==0 && populationImportErrorVOList.size() > 0){
                return R.fail(JSON.toJSONString(populationImportErrorVOList));
            }
        }else {
            return R.fail(JSON.toJSONString(populationImportErrorVOList));
        }
        return R.ok("共计导入服务数量："+comCvtServeDOS.size());
    }