新增小程序积分列表 修改积分发放流程

lidongdong

2023-08-24 8c0b5b30e5200e7bd45aa34507c3623e17fcce91

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

@@ -115,30 +115,34 @@
    }

    @Override
    public R detailWorkGuide(Long workGuideId, Long communityId) {
    public R detailWorkGuide(String workGuideId, String communityId) {
        ComActWorkGuideDO workGuideDO = this.baseMapper.selectById(workGuideId);
        if (workGuideDO == null) {
            return R.fail("Id有误！");
        }
        ComActWorkGuideVO vo = new ComActWorkGuideVO();
        BeanUtils.copyProperties(workGuideDO, vo);
        ComActDO comActDO = comActDAO.selectById(communityId);
        if (comActDO != null) {
            vo.setAddress(comActDO.getAddress());
            vo.setPhone(comActDO.getContactsPhone());
            vo.setLon(comActDO.getLng());
            vo.setLat(comActDO.getLat());
        }

        List<ComActWorkGuideMaterialDO> workGuideMaterialDOS =
            workGuideMaterialDAO.selectList(new LambdaQueryWrapper<ComActWorkGuideMaterialDO>()
                .eq(ComActWorkGuideMaterialDO::getWorkGuideId, workGuideId));
        workGuideMaterialDOS.forEach(workGuideMaterialDO -> {
            ComActWorkGuideMaterialVO workGuideMaterialVO = new ComActWorkGuideMaterialVO();
            workGuideMaterialVO.setId(workGuideMaterialDO.getId());
            workGuideMaterialVO.setMaterialName(workGuideMaterialDO.getMaterialName());
            vo.getMaterials().add(workGuideMaterialVO);
        });
        if(!StringUtils.isEmpty(communityId))
        {
            ComActDO comActDO = comActDAO.selectById(communityId);
            if (comActDO != null) {
                vo.setAddress(comActDO.getAddress());
                vo.setPhone(comActDO.getContactsPhone());
                vo.setLon(comActDO.getLng());
                vo.setLat(comActDO.getLat());
            }

            List<ComActWorkGuideMaterialDO> workGuideMaterialDOS =
                    workGuideMaterialDAO.selectList(new LambdaQueryWrapper<ComActWorkGuideMaterialDO>()
                            .eq(ComActWorkGuideMaterialDO::getWorkGuideId, workGuideId));
            workGuideMaterialDOS.forEach(workGuideMaterialDO -> {
                ComActWorkGuideMaterialVO workGuideMaterialVO = new ComActWorkGuideMaterialVO();
                workGuideMaterialVO.setId(workGuideMaterialDO.getId());
                workGuideMaterialVO.setMaterialName(workGuideMaterialDO.getMaterialName());
                vo.getMaterials().add(workGuideMaterialVO);
            });
        }
        return R.ok(vo);
    }

@@ -185,7 +189,7 @@
        //结果数据集合
        List<ComActWorkGuideAppletsVO> resultList = new ArrayList<>();

        List<ComActWorkGuideAppletsVO> workGuideClassifyList = comActWorkGuideClassifyDAO.listWorkGuideClassify();
        List<ComActWorkGuideAppletsVO> workGuideClassifyList = comActWorkGuideClassifyDAO.listWorkGuideClassify(pageActWorkGuideDTO.getAreaCode());
        //通过办事指南分类查询分类下办事指南
        workGuideClassifyList.forEach(workGuideClassify -> {
            List<ComActWorkGuideDetailAppletsVO> workGuideList = this.baseMapper.getWorkGuideListByClassifyId(workGuideClassify.getId(),10L);