便民服务 小程序接口

Null

2021-03-12 bc796a0a155341f25b889dec7019df27a36b031c

便民服务 小程序接口

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java

New file
@@ -0,0 +1,49 @@
package com.panzhihua.applets.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComCvtBusinessVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * @description: 社区便民服务商家接口
 * @author: Null
 * @date: 2021/3/11 13:26
 */
@Slf4j
@Api(tags = {"社区运营/便民服务"})
@RestController
@RequestMapping("/convenient")
public class CommunityConvenientApi extends BaseController {

    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "分页查询便民服务商家",response = ComCvtBusinessVO.class)
    @PostMapping("/business/area/page")
    public R pageComCvtBusiness(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = loginUserInfo.getCommunityId();
        if (null!=communityId && 0!=communityId) {
            comCvtBusinessAppletsDTO.setCommunityId(communityId);
        }
        return communityService.pageComCvtBusinessByServiceArea(comCvtBusinessAppletsDTO);
    }


    @ApiOperation(value = "查询便民服务商家详情")
    @GetMapping("/business/get")
    public R getComCvtBusinessServeDetail(@RequestParam("id") Long id) {
        return communityService.getComCvtBusinessServeDetail(id);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComCvtBusinessAppletsDTO.java

New file
@@ -0,0 +1,26 @@
package com.panzhihua.common.model.dtos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @description: 便民服务商家请求参数
 * @author: Null
 * @date: 2021/3/11 10:36
 */
@Data
@ApiModel("便民服务商家请求参数")
public class PageComCvtBusinessAppletsDTO {

    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;

    @ApiModelProperty(value = "分页-当前页数",example = "1")
    private Long pageNum;

    @ApiModelProperty(value = "分页-每页记录数",example = "10")
    private Long pageSize;


}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtBusinessCategoryServeVO.java

New file
@@ -0,0 +1,27 @@
package com.panzhihua.common.model.vos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.List;

/**
 * @description: 小程序便民服务商家服务分类
 * @author: Null
 * @date: 2021/3/12 13:36
 */
@Data
@ApiModel("便民服务商家服务分类")
public class ComCvtBusinessCategoryServeVO implements Serializable {

    private static final long serialVersionUID = 925697143924235721L;


    @ApiModelProperty("商家服务分类名称")
    private String categoryName;

    @ApiModelProperty("商家分类服务列表")
    private List<ComCvtServeVO> comCvtServeVOS;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtBusinessDetailVO.java

New file
@@ -0,0 +1,58 @@
package com.panzhihua.common.model.vos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.List;

/**
 * @description: 小程序便民服务商家详情信息
 * @author: Null
 * @date: 2021/3/12 13:36
 */
@Data
@ApiModel("便民服务商家详情信息")
public class ComCvtBusinessDetailVO implements Serializable {

    private static final long serialVersionUID = 8381895998705845852L;
    @ApiModelProperty("商家ID")
    private Long id;

    @ApiModelProperty("商家名称")
    private String name;

    @ApiModelProperty("联系人")
    private String contacts;

    @ApiModelProperty("联系方式")
    private String contactsPhone;

    @ApiModelProperty("详细地址")
    private String address;

    @ApiModelProperty("主营业务")
    private String busScope;

    @ApiModelProperty("服务范围标记：1-全攀枝花市，2-部分地区")
    private Integer areaFlag;

    @ApiModelProperty("商家logo")
    private String logo;

    @ApiModelProperty(value = "社区主键",hidden = true)
    private Long communityId;

    @ApiModelProperty("服务范围集合")
    List<String> comActVOS;

    @ApiModelProperty("商家介绍媒体文件类型：1-图片 2-视频")
    private Integer mediaType;

    @ApiModelProperty("介绍媒体文件集合")
    private List<String> mediaPaths;

    @ApiModelProperty("分类服务")
    List<ComCvtBusinessCategoryServeVO> categoryServeVOS;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -928,6 +928,14 @@
    R detailMessage(@RequestParam("id")Long id);

    /**
     * 小程序通过便民服务区域分页查询便民服务商家
     * @param comCvtBusinessAppletsDTO 查询参数
     * @return 返回结果
     */
    @PostMapping("/convenient/business/area/page")
    R pageComCvtBusinessByServiceArea(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO);

    /**
     * 社区后台分页查询便民服务商家
     * @param pageComCvtBusinessDTO 查询参数
     * @return 返回结果
@@ -1070,4 +1078,13 @@
     */
    @DeleteMapping("/convenient/serve/delete")
    R deleteComCvtServe(@RequestParam("id") Long id);


    /**
     * 小程序便民服务商家详情
     * @param id 商家ID
     * @return
     */
    @GetMapping("/convenient/business/serve/get")
    R getComCvtBusinessServeDetail(@RequestParam("id")Long id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java

@@ -5,6 +5,7 @@
import com.panzhihua.service_community.service.ComCvtBusinessService;
import com.panzhihua.service_community.service.ComCvtCategoryService;
import com.panzhihua.service_community.service.ComCvtServeService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

@@ -38,6 +39,17 @@
    @PostMapping("/business/page")
    public R pageComCvtBusiness(@RequestBody PageComCvtBusinessDTO pageComCvtBusinessDTO) {
        return comCvtBusinessService.pageComCvtBusiness(pageComCvtBusinessDTO);
    }

    /**
     * 小程序通过便民服务区域分页查询便民服务商家
     *
     * @param comCvtBusinessAppletsDTO 查询参数
     * @return 返回结果
     */
    @PostMapping("/business/area/page")
    public R pageComCvtBusinessByServiceArea(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO) {
        return comCvtBusinessService.pageComCvtBusinessByServiceArea(comCvtBusinessAppletsDTO);
    }

    /**
@@ -203,4 +215,14 @@
    public R deleteComCvtServe(@RequestParam("id") Long id) {
        return comCvtServeService.deleteComCvtServe(id);
    }

    /**
     * 小程序便民服务商家详情
     * @param id 商家ID
     * @return
     */
    @GetMapping("/business/serve/get")
    public R getComCvtBusinessServeDetail(@RequestParam("id")Long id){
        return comCvtBusinessService.getComCvtBusinessServeDetail(id);
    };
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCvtBusinessDAO.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
import com.panzhihua.common.model.vos.community.ComCvtBusinessVO;
import com.panzhihua.service_community.model.dos.ComCvtBusinessDO;
@@ -29,4 +30,24 @@
            " order by a.create_at desc"+
            "</script>")
    IPage<ComCvtBusinessVO> pageComCvtBusiness(Page page, @Param("pageComCvtBusinessDTO") PageComCvtBusinessDTO pageComCvtBusinessDTO);


    @Select("<script> " +
            "SELECT " +
            "t.*  " +
            "FROM " +
            "com_cvt_business t  " +
            " <where>" +
            "<if test='comCvtBusinessAppletsDTO.communityId != null and comCvtBusinessAppletsDTO.communityId != 0'>" +
            " t.area_flag = 1 " +
            " OR (" +
            " t.area_flag = 2 " +
            " AND EXISTS ( SELECT * FROM com_cvt_business_area t2 WHERE t2.business_id = t.id AND t2.community_id = #{comCvtBusinessAppletsDTO.communityId} ) \n" +
            " ) " +
            " </if> " +
            " </where>" +
            " order by t.create_at desc"+
            "</script>")
    IPage<ComCvtBusinessVO> pageComCvtBusinessByServiceArea(Page page, @Param("comCvtBusinessAppletsDTO") PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComCvtBusinessAreaService.java

@@ -18,4 +18,10 @@
     */
    R batchSave(List<ComCvtBusinessAreaDO> comCvtBusinessAreaDOs);

    /**
     * 查询商家服务范围的社区Ids集合
     * @param businessId
     * @return
     */
    List<Long> getBusinessServiceAreaIds(Long businessId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComCvtBusinessIntroduceService.java

@@ -17,4 +17,11 @@
     * @param comCvtBusinessIntroduceDOS 参数
     */
    R batchSave(List<ComCvtBusinessIntroduceDO> comCvtBusinessIntroduceDOS);

    /**
     * 查询商家介绍媒体文件集合
     * @param businessId
     * @return
     */
    List<String> getBusinessMediaPaths(Long businessId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComCvtBusinessService.java

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

import com.panzhihua.common.model.dtos.community.ComCvtBusinessDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
import com.panzhihua.common.model.vos.R;

@@ -44,4 +45,18 @@
     * @return
     */
    R deleteComCvtBusiness(Long id);

    /**
     * 通过服务区域 分页查询便民服务商家
     * @param comCvtBusinessAppletsDTO 查询参数
     * @return 分页集合
     */
    R pageComCvtBusinessByServiceArea(PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO);

    /**
     * 小程序便民服务商家详情
     * @param id
     * @return
     */
    R getComCvtBusinessServeDetail(Long id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComCvtServeService.java

@@ -3,6 +3,9 @@
import com.panzhihua.common.model.dtos.community.ComCvtServeDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtServeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComCvtBusinessCategoryServeVO;

import java.util.List;

/**
 * @description: 社区 便民服务接口
@@ -44,4 +47,12 @@
     * @return
     */
    R deleteComCvtServe(Long id);


    /**
     * 查询商家服务
     * @param businessId 商家主键
     * @return
     */
    List<ComCvtBusinessCategoryServeVO> getBusinessCategoryServeVOS(Long businessId);
}

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

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

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.dao.ComCvtBusinessAreaDAO;
@@ -7,7 +8,9 @@
import com.panzhihua.service_community.service.ComCvtBusinessAreaService;
import org.springframework.stereotype.Service;

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

/**
 * @description: 便民服务商家服务范围接口
@@ -17,6 +20,9 @@
@Service
public class ComCvtBusinessAreaServiceImpl extends ServiceImpl<ComCvtBusinessAreaDAO, ComCvtBusinessAreaDO> implements ComCvtBusinessAreaService {

    @Resource
    private ComCvtBusinessAreaDAO comCvtBusinessAreaDAO;

    @Override
    public R batchSave(List<ComCvtBusinessAreaDO> comCvtBusinessAreaDOs) {
        boolean result  = this.saveBatch(comCvtBusinessAreaDOs);
@@ -25,4 +31,12 @@
        }
        return R.fail();
    }

    @Override
    public List<Long> getBusinessServiceAreaIds(Long businessId) {
        List<ComCvtBusinessAreaDO> comCvtBusinessAreaDOS = comCvtBusinessAreaDAO.selectList(new QueryWrapper<ComCvtBusinessAreaDO>().lambda().eq(ComCvtBusinessAreaDO::getBusinessId, businessId));
        List<Long> ids = comCvtBusinessAreaDOS.stream().map(comCvtBusinessAreaDO -> comCvtBusinessAreaDO.getCommunityId()).collect(Collectors.toList());
        return ids;
    }

}

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

@@ -1,12 +1,16 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.dao.ComCvtBusinessIntroduceDAO;
import com.panzhihua.service_community.model.dos.ComCvtBusinessIntroduceDO;
import com.panzhihua.service_community.service.ComCvtBusinessIntroduceService;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;

/**
@@ -16,6 +20,10 @@
 */
@Service
public class ComCvtBusinessIntroduceServiceImpl extends ServiceImpl<ComCvtBusinessIntroduceDAO,ComCvtBusinessIntroduceDO> implements ComCvtBusinessIntroduceService {

    @Resource
    private ComCvtBusinessIntroduceDAO comCvtBusinessIntroduceDAO;

    @Override
    public R batchSave(List<ComCvtBusinessIntroduceDO> comCvtBusinessIntroduceDOS) {
        boolean result  = this.saveBatch(comCvtBusinessIntroduceDOS);
@@ -24,4 +32,17 @@
        }
        return R.fail();
    }

    @Override
    public List<String> getBusinessMediaPaths(Long businessId) {
        List<String> mediaPaths = new ArrayList<>();
        List<ComCvtBusinessIntroduceDO> comCvtBusinessIntroduceDOS = comCvtBusinessIntroduceDAO.selectList(new QueryWrapper<ComCvtBusinessIntroduceDO>().lambda().eq(ComCvtBusinessIntroduceDO::getBusinessId, businessId));
        if (!ObjectUtils.isEmpty(comCvtBusinessIntroduceDOS)) {

            comCvtBusinessIntroduceDOS.forEach(media -> {
                mediaPaths.add(media.getMediaPath());
            });
        }
        return mediaPaths;
    }
}

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

@@ -5,9 +5,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.ComCvtBusinessDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComCvtBusinessDetailVO;
import com.panzhihua.common.model.vos.community.ComCvtBusinessVO;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComCvtBusinessAreaDAO;
@@ -20,6 +22,7 @@
import com.panzhihua.service_community.service.ComCvtBusinessAreaService;
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;
@@ -49,6 +52,8 @@
    private ComCvtBusinessAreaService comCvtBusinessAreaService;
    @Resource
    private ComCvtBusinessIntroduceService comCvtBusinessIntroduceService;
    @Resource
    private ComCvtServeService comCvtServeService;
    @Resource
    private ComActDAO comActDAO;

@@ -145,8 +150,7 @@
        }
        ComCvtBusinessVO comCvtBusinessVO = new ComCvtBusinessVO();
        BeanUtils.copyProperties(comCvtBusinessDO, comCvtBusinessVO);
        List<ComCvtBusinessAreaDO> comCvtBusinessAreaDOS = comCvtBusinessAreaDAO.selectList(new QueryWrapper<ComCvtBusinessAreaDO>().lambda().eq(ComCvtBusinessAreaDO::getBusinessId, comCvtBusinessDO.getId()));
        List<Long> areaIds = comCvtBusinessAreaDOS.stream().map(comCvtBusinessAreaDO -> comCvtBusinessAreaDO.getCommunityId()).collect(Collectors.toList());
        List<Long> areaIds = comCvtBusinessAreaService.getBusinessServiceAreaIds(comCvtBusinessDO.getId());
        List<ComActDO> comActDOS = comActDAO.selectBatchIds(areaIds);
        if (!ObjectUtils.isEmpty(comActDOS)) {
            List<ComActVO> comActVOS = new ArrayList<>();
@@ -157,14 +161,8 @@
            });
            comCvtBusinessVO.setComActVOS(comActVOS);
        }
        List<ComCvtBusinessIntroduceDO> comCvtBusinessIntroduceDOS = comCvtBusinessIntroduceDAO.selectList(new QueryWrapper<ComCvtBusinessIntroduceDO>().lambda().eq(ComCvtBusinessIntroduceDO::getBusinessId, comCvtBusinessDO.getId()));
        if (!ObjectUtils.isEmpty(comCvtBusinessIntroduceDOS)) {
            List<String> mediaPaths = new ArrayList<>();
            comCvtBusinessIntroduceDOS.forEach(media -> {
                mediaPaths.add(media.getMediaPath());
            });
            comCvtBusinessVO.setMediaPaths(mediaPaths);
        }
        List<String> mediaPaths = comCvtBusinessIntroduceService.getBusinessMediaPaths(id);
        comCvtBusinessVO.setMediaPaths(mediaPaths);
        return R.ok(comCvtBusinessVO);
    }

@@ -181,4 +179,46 @@
        comCvtBusinessIntroduceDAO.delete(new QueryWrapper<ComCvtBusinessIntroduceDO>().lambda().eq(ComCvtBusinessIntroduceDO::getBusinessId, id));
        return R.ok();
    }

    @Override
    public R pageComCvtBusinessByServiceArea(PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO) {
        Page page = new Page<>();
        Long pageNum = comCvtBusinessAppletsDTO.getPageNum();
        Long pageSize = comCvtBusinessAppletsDTO.getPageSize();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComCvtBusinessVO> iPage = comCvtBusinessDAO.pageComCvtBusinessByServiceArea(page, comCvtBusinessAppletsDTO);
        return R.ok(iPage);
    }

    @Override
    public R getComCvtBusinessServeDetail(Long id) {
        ComCvtBusinessDO comCvtBusinessDO = comCvtBusinessDAO.selectById(id);
        if (null == comCvtBusinessDO) {
            return R.fail("商家不存在");
        }
        ComCvtBusinessDetailVO comCvtBusinessDetailVO = new ComCvtBusinessDetailVO();
        BeanUtils.copyProperties(comCvtBusinessDO, comCvtBusinessDetailVO);
        if(comCvtBusinessDO.getAreaFlag()!=1){
            List<Long> areaIds = comCvtBusinessAreaService.getBusinessServiceAreaIds(comCvtBusinessDO.getId());
            List<ComActDO> comActDOS = comActDAO.selectBatchIds(areaIds);
            if (!ObjectUtils.isEmpty(comActDOS)) {
                List<String> comActVOS = new ArrayList<>();
                comActDOS.forEach(comActDO -> {
                    comActVOS.add(comActDO.getName());
                });
                comCvtBusinessDetailVO.setComActVOS(comActVOS);
            }
        }
        List<String> mediaPaths = comCvtBusinessIntroduceService.getBusinessMediaPaths(id);
        comCvtBusinessDetailVO.setMediaPaths(mediaPaths);
        comCvtBusinessDetailVO.setCategoryServeVOS(comCvtServeService.getBusinessCategoryServeVOS(id));
        return R.ok(comCvtBusinessDetailVO);
    }
}

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

@@ -1,11 +1,12 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.ComCvtServeDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtServeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComCvtCategoryVO;
import com.panzhihua.common.model.vos.community.ComCvtBusinessCategoryServeVO;
import com.panzhihua.common.model.vos.community.ComCvtServeVO;
import com.panzhihua.service_community.dao.ComCvtBusinessDAO;
import com.panzhihua.service_community.dao.ComCvtCategoryDAO;
@@ -16,8 +17,12 @@
import com.panzhihua.service_community.service.ComCvtServeService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

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

/**
 * @description: 社区 便民服务接口实现类
@@ -57,9 +62,9 @@
    @Override
    public R addComCvtServe(ComCvtServeDTO comCvtServeDTO) {
        ComCvtServeDO comCvtServeDO = new ComCvtServeDO();
        BeanUtils.copyProperties(comCvtServeDTO,comCvtServeDO);
        BeanUtils.copyProperties(comCvtServeDTO, comCvtServeDO);
        int insert = comCvtServeDAO.insert(comCvtServeDO);
        if(insert>0){
        if (insert > 0) {
            return R.ok();
        }
        return R.fail();
@@ -68,12 +73,12 @@
    @Override
    public R putComCvtServe(ComCvtServeDTO comCvtServeDTO) {
        ComCvtServeDO comCvtServeDO = comCvtServeDAO.selectById(comCvtServeDTO.getId());
        if(null==comCvtServeDO){
        if (null == comCvtServeDO) {
            return R.fail("该服务不存在");
        }
        BeanUtils.copyProperties(comCvtServeDTO,comCvtServeDO);
        BeanUtils.copyProperties(comCvtServeDTO, comCvtServeDO);
        int update = comCvtServeDAO.updateById(comCvtServeDO);
        if(update>0){
        if (update > 0) {
            return R.ok();
        }
        return R.fail();
@@ -82,17 +87,17 @@
    @Override
    public R getComCvtServe(Long id) {
        ComCvtServeDO comCvtServeDO = comCvtServeDAO.selectById(id);
        if(null==comCvtServeDO){
        if (null == comCvtServeDO) {
            return R.fail("该服务不存在");
        }
        ComCvtServeVO comCvtServeVO = new ComCvtServeVO();
        BeanUtils.copyProperties(comCvtServeDO,comCvtServeVO);
        BeanUtils.copyProperties(comCvtServeDO, comCvtServeVO);
        ComCvtBusinessDO comCvtBusinessDO = comCvtBusinessDAO.selectById(comCvtServeDO.getBusinessId());
        if(null!=comCvtBusinessDO){
        if (null != comCvtBusinessDO) {
            comCvtServeVO.setBusinessName(comCvtBusinessDO.getName());
        }
        ComCvtCategoryDO comCvtCategoryDO = comCvtCategoryDAO.selectById(comCvtServeDO.getCategoryId());
        if(null!=comCvtCategoryDO){
        if (null != comCvtCategoryDO) {
            comCvtServeVO.setCategoryName(comCvtCategoryDO.getName());
        }
        return R.ok(comCvtServeDO);
@@ -101,13 +106,47 @@
    @Override
    public R deleteComCvtServe(Long id) {
        ComCvtServeDO comCvtServeDO = comCvtServeDAO.selectById(id);
        if(null==comCvtServeDO){
        if (null == comCvtServeDO) {
            return R.fail("该服务不存在");
        }
        int count = comCvtServeDAO.deleteById(id);
        if(count<1){
        if (count < 1) {
            return R.fail("删除失败");
        }
        return R.ok();
    }

    @Override
    public List<ComCvtBusinessCategoryServeVO> getBusinessCategoryServeVOS(Long businessId) {
        List<ComCvtBusinessCategoryServeVO> comCvtBusinessCategoryServeVOS = new ArrayList<>();
        List<ComCvtServeDO> comCvtServeDOS = comCvtServeDAO.selectList(new QueryWrapper<ComCvtServeDO>().lambda().eq(ComCvtServeDO::getBusinessId, businessId));
        List<ComCvtCategoryDO> categoryDOS = comCvtCategoryDAO.selectList(new QueryWrapper<ComCvtCategoryDO>().lambda().orderByDesc(ComCvtCategoryDO::getWeight));
        categoryDOS.stream().forEach(categoryDO -> {
            List<ComCvtServeVO> serveVOS = getComCvtServeDOSByCategory(comCvtServeDOS, categoryDO.getId());
            if (!ObjectUtils.isEmpty(serveVOS)) {
                ComCvtBusinessCategoryServeVO comCvtServeVo = new ComCvtBusinessCategoryServeVO();
                comCvtServeVo.setCategoryName(categoryDO.getName());
                comCvtServeVo.setComCvtServeVOS(serveVOS);
                comCvtBusinessCategoryServeVOS.add(comCvtServeVo);
            }
        });
        return comCvtBusinessCategoryServeVOS;
    }

    /**
     * 按分类筛选
     * @param comCvtServeDOS
     * @param categoryId
     * @return
     */
    private List<ComCvtServeVO> getComCvtServeDOSByCategory(List<ComCvtServeDO> comCvtServeDOS, Long categoryId) {
        List<ComCvtServeVO> comCvtServeVOS = new ArrayList<>();
        comCvtServeDOS = comCvtServeDOS.stream().filter(dos -> dos.getCategoryId() == categoryId).collect(Collectors.toList());
        comCvtServeDOS.forEach(comCvtServeDO -> {
            ComCvtServeVO vo = new ComCvtServeVO();
            BeanUtils.copyProperties(comCvtServeDO, vo);
            comCvtServeVOS.add(vo);
        });
        return comCvtServeVOS;
    }
}