Null
2021-03-15 4def97fac3d7709793915789f434dfb6c8d1d1bb
模板导入便民服务
3个文件已修改
90 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCvtServeDAO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCvtServeDO.java 45 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java 43 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCvtServeDAO.java
@@ -38,4 +38,6 @@
            " ORDER BY t.create_at desc" +
            "</script>")
    IPage<ComCvtServeVO> pageComCvtServe(Page page, @Param(value = "pageComCvtServeDTO") PageComCvtServeDTO pageComCvtServeDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCvtServeDO.java
@@ -19,31 +19,58 @@
public class ComCvtServeDO implements Serializable {
    private static final long serialVersionUID = 6641346373561429677L;
    /**服务主键*/
    /**
     * 服务主键
     */
    private Long id;
    /**服务名称*/
    /**
     * 服务名称
     */
    private String serviceName;
    /**服务价格*/
    /**
     * 服务价格
     */
    private BigDecimal servicePrice;
    /**服务分类ID*/
    /**
     * 服务分类ID
     */
    private Long categoryId;
    /**服务描述*/
    /**
     * 服务描述
     */
    private String serviceDesc;
    /**所属商家ID*/
    /**
     * 所属商家ID
     */
    private Long businessId;
    /**备注*/
    /**
     * 备注
     */
    private String remark;
    /**创建人*/
    /**
     * 创建人
     */
    private Long createBy;
    /**创建时间*/
    /**
     * 创建时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    public boolean equals(ComCvtServeDO obj) {
        return obj.getBusinessId() == this.getBusinessId()
                && obj.getCategoryId() == this.getCategoryId()
                && obj.getServiceName().equals(this.getServiceName())
                && obj.getServicePrice().compareTo(this.getServicePrice()) == 0
                && obj.getServiceDesc().equals(this.getServiceDesc())
                ;
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java
@@ -24,10 +24,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 +66,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 +82,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();
        }
@@ -175,13 +179,19 @@
                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()));
                }
            }
        });
        this.saveBatch(comCvtServeDOS);
        return R.ok();
        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 +202,7 @@
        return categoryMap;
    }
    //获取商家集合
    private Map<String, Long> getBusinessMap(List<ComCvtBusinessDO> comCvtBusinessDOS) {
        Map<String, Long> businessMap = new HashMap<>();
        if (!ObjectUtils.isEmpty(comCvtBusinessDOS)) {
@@ -201,4 +212,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;
    }
}