三社功能,抽奖功能修改

101captain

2022-03-01 9bab267e8be49ade8df6ec3d6d3f96b03321e429

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

@@ -279,10 +279,12 @@
                    }
                    comActActivityVO1.setComActActPrizeVOList(comActActPrizeVOList);
                    Integer volunteerMax = comActActivityVO1.getVolunteerMax();
                    if(comActActivityVO1.getType()==null){
                    if (volunteerMax.intValue() != 0) {
                        comActActivityVO1.setType(1);
                    } else {
                        comActActivityVO1.setType(2);
                        }
                    }
                    fillActivitySignList(id, comActActivityVO1);
                });
@@ -1389,8 +1391,8 @@
     */
    @PostMapping("listactivity")
    public R listActivity(@RequestParam("userId") Long userId,
                          @RequestParam(value = "status", required = false) Integer status) {
        return comActActivityService.listActivity(userId, status);
                          @RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type", required = false) Integer type) {
        return comActActivityService.listActivity(userId, status,type);
    }

    /**