Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

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

@@ -1,5 +1,16 @@
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;
@@ -24,18 +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.boot.util.LambdaSafe;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;

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

/**
 * @description: 便民服务商家接口
@@ -43,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;
@@ -119,9 +119,11 @@
        BeanUtils.copyProperties(comCvtBusinessDTO, comCvtBusinessDO);
        comCvtBusinessDAO.updateById(comCvtBusinessDO);
        //删除服务范围
        comCvtBusinessAreaDAO.delete(new QueryWrapper<ComCvtBusinessAreaDO>().lambda().eq(ComCvtBusinessAreaDO::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()));
        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 -> {
@@ -156,7 +158,8 @@
        List<ComActDO> comActDOS = new ArrayList<>();

        if(comCvtBusinessDO.getAreaFlag()==1){
            LambdaQueryWrapper<ComActDO> lambdaQueryWrapper = new LambdaQueryWrapper<ComActDO>().eq(ComActDO::getState,0);
            LambdaQueryWrapper<ComActDO> lambdaQueryWrapper =
                new LambdaQueryWrapper<ComActDO>().eq(ComActDO::getState, 0);
            comActDOS = comActDAO.selectList(lambdaQueryWrapper);
        }else{
            List<Long> areaIds = comCvtBusinessAreaService.getBusinessServiceAreaIds(comCvtBusinessDO.getId());
@@ -187,9 +190,11 @@
            return R.fail();
        }
        //删除服务范围
        comCvtBusinessAreaDAO.delete(new QueryWrapper<ComCvtBusinessAreaDO>().lambda().eq(ComCvtBusinessAreaDO::getBusinessId, id));
        comCvtBusinessAreaDAO
            .delete(new QueryWrapper<ComCvtBusinessAreaDO>().lambda().eq(ComCvtBusinessAreaDO::getBusinessId, id));
        //删除商家介绍媒体文件
        comCvtBusinessIntroduceDAO.delete(new QueryWrapper<ComCvtBusinessIntroduceDO>().lambda().eq(ComCvtBusinessIntroduceDO::getBusinessId, id));
        comCvtBusinessIntroduceDAO.delete(
            new QueryWrapper<ComCvtBusinessIntroduceDO>().lambda().eq(ComCvtBusinessIntroduceDO::getBusinessId, id));
        return R.ok();
    }

@@ -206,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);
    }