12/23 大屏修改

101captain

2021-12-23 5a8a90c095280fbd2106869ecd2bad10e01a57a6

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

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

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import javax.annotation.Resource;

import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;

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;
@@ -23,16 +35,6 @@
import com.panzhihua.service_community.service.ComCvtBusinessIntroduceService;
import com.panzhihua.service_community.service.ComCvtBusinessService;
import com.panzhihua.service_community.service.ComCvtServeService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @description: 便民服务商家接口
@@ -40,7 +42,8 @@
 * @date: 2021/3/11 11:11
 */
@Service
public class ComCvtBusinessServiceImpl extends ServiceImpl<ComCvtBusinessDAO, ComCvtBusinessDO> implements ComCvtBusinessService {
public class ComCvtBusinessServiceImpl extends ServiceImpl<ComCvtBusinessDAO, ComCvtBusinessDO>
    implements ComCvtBusinessService {

    @Resource
    private ComCvtBusinessDAO comCvtBusinessDAO;
@@ -115,10 +118,12 @@
        }
        BeanUtils.copyProperties(comCvtBusinessDTO, comCvtBusinessDO);
        comCvtBusinessDAO.updateById(comCvtBusinessDO);
        //删除服务范围
        comCvtBusinessAreaDAO.delete(new QueryWrapper<ComCvtBusinessAreaDO>().lambda().eq(ComCvtBusinessAreaDO::getBusinessId, comCvtBusinessDO.getId()));
        //删除商家介绍媒体文件
        comCvtBusinessIntroduceDAO.delete(new QueryWrapper<ComCvtBusinessIntroduceDO>().lambda().eq(ComCvtBusinessIntroduceDO::getBusinessId, comCvtBusinessDO.getId()));
        // 删除服务范围
        comCvtBusinessAreaDAO.delete(new QueryWrapper<ComCvtBusinessAreaDO>().lambda()
            .eq(ComCvtBusinessAreaDO::getBusinessId, comCvtBusinessDO.getId()));
        // 删除商家介绍媒体文件
        comCvtBusinessIntroduceDAO.delete(new QueryWrapper<ComCvtBusinessIntroduceDO>().lambda()
            .eq(ComCvtBusinessIntroduceDO::getBusinessId, comCvtBusinessDO.getId()));
        if (comCvtBusinessDTO.getAreaFlag() == 2 && !ObjectUtils.isEmpty(comCvtBusinessDTO.getCommunityIds())) {
            List<ComCvtBusinessAreaDO> comCvtBusinessAreaDOS = new ArrayList<>();
            comCvtBusinessDTO.getCommunityIds().stream().forEach(areaId -> {
@@ -152,11 +157,13 @@
        BeanUtils.copyProperties(comCvtBusinessDO, comCvtBusinessVO);
        List<ComActDO> comActDOS = new ArrayList<>();

        if(comCvtBusinessDO.getAreaFlag()==1){
            comActDOS = comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getState,0));
        }else{
        if (comCvtBusinessDO.getAreaFlag() == 1) {
            LambdaQueryWrapper<ComActDO> lambdaQueryWrapper =
                new LambdaQueryWrapper<ComActDO>().eq(ComActDO::getState, 0);
            comActDOS = comActDAO.selectList(lambdaQueryWrapper);
        } else {
            List<Long> areaIds = comCvtBusinessAreaService.getBusinessServiceAreaIds(comCvtBusinessDO.getId());
            if(!ObjectUtils.isEmpty(areaIds)){
            if (!ObjectUtils.isEmpty(areaIds)) {
                comActDOS = comActDAO.selectBatchIds(areaIds);
            }
        }
@@ -179,13 +186,15 @@
    @Transactional(rollbackFor = Exception.class)
    public R deleteComCvtBusiness(Long id) {
        int delete = comCvtBusinessDAO.deleteById(id);
        if (delete==0) {
        if (delete == 0) {
            return R.fail();
        }
        //删除服务范围
        comCvtBusinessAreaDAO.delete(new QueryWrapper<ComCvtBusinessAreaDO>().lambda().eq(ComCvtBusinessAreaDO::getBusinessId, id));
        //删除商家介绍媒体文件
        comCvtBusinessIntroduceDAO.delete(new QueryWrapper<ComCvtBusinessIntroduceDO>().lambda().eq(ComCvtBusinessIntroduceDO::getBusinessId, id));
        // 删除服务范围
        comCvtBusinessAreaDAO
            .delete(new QueryWrapper<ComCvtBusinessAreaDO>().lambda().eq(ComCvtBusinessAreaDO::getBusinessId, id));
        // 删除商家介绍媒体文件
        comCvtBusinessIntroduceDAO.delete(
            new QueryWrapper<ComCvtBusinessIntroduceDO>().lambda().eq(ComCvtBusinessIntroduceDO::getBusinessId, id));
        return R.ok();
    }

@@ -202,7 +211,8 @@
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComCvtBusinessVO> iPage = comCvtBusinessDAO.pageComCvtBusinessByServiceArea(page, comCvtBusinessAppletsDTO);
        IPage<ComCvtBusinessVO> iPage =
            comCvtBusinessDAO.pageComCvtBusinessByServiceArea(page, comCvtBusinessAppletsDTO);
        return R.ok(iPage);
    }

@@ -214,7 +224,7 @@
        }
        ComCvtBusinessDetailVO comCvtBusinessDetailVO = new ComCvtBusinessDetailVO();
        BeanUtils.copyProperties(comCvtBusinessDO, comCvtBusinessDetailVO);
        if(comCvtBusinessDO.getAreaFlag()!=1){
        if (comCvtBusinessDO.getAreaFlag() != 1) {
            List<Long> areaIds = comCvtBusinessAreaService.getBusinessServiceAreaIds(comCvtBusinessDO.getId());
            List<ComActDO> comActDOS = comActDAO.selectBatchIds(areaIds);
            if (!ObjectUtils.isEmpty(comActDOS)) {