随手拍

huanghongfa

2021-01-27 26dfb17d21b10b753c26b109435942cd7ff83c19

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

@@ -109,7 +109,7 @@
            sysUserNoticeVO.setBusinessType(6);
//            sysUserNoticeVO.setBusinessTitle(comActActivityVO.getActivityName());
            sysUserNoticeVO.setBusinessContent(String.format("驳回原因：%s",r.getMsg()));
//            sysUserNoticeVO.setBusinessId(activityId);
//            sysUserNoticeVO.setBusinessId(activityId);R
            sysUserNoticeVO.setStatus(0);
            sysUserNoticeVO.setBusinessStatus(1);
            R r1 = userService.addNotice(sysUserNoticeVO);
@@ -213,6 +213,10 @@
            List<ComActActivityVO> collect = comActActivityVOS1.stream().sorted(Comparator.comparing(ComActActivityVO::getBeginAt).reversed()).collect(Collectors.toList());
            comActActivityVOS=collect;
        }
        if (!ObjectUtils.isEmpty(comActActivityVOS)) {
            List<ComActActivityVO> collect = comActActivityVOS.stream().sorted(Comparator.comparing(ComActActivityVO::getSingDate).reversed()).collect(Collectors.toList());
            return R.ok(collect);
        }
        return R.ok(comActActivityVOS);
    }

@@ -220,10 +224,9 @@
    @PostMapping("pageeasyphoto")
    public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        Long userId = this.getUserId();
        comActEasyPhotoVO.setUserId(userId);
        comActEasyPhotoVO.setLogInUserId(userId);
        comActEasyPhotoVO.setSponsorId(userId);
        comActEasyPhotoVO.setCommunityId(null);
        return communityService.pageEasyPhoto(comActEasyPhotoVO);
        return communityService.pageEasyPhotoApplets(comActEasyPhotoVO);
    }

    @ApiOperation(value = "分页查询我的微心愿",response = ComActMicroWishVO.class )