Merge branch 'haucheng_panzhihua' into huacheng_test

zhaozhengjie

2022-09-17 fe1a0613d48e9b76b474d22073e72feda23b0d5c

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

@@ -254,8 +254,8 @@

    @ApiOperation(value = "首页广告banner", response = ComOpsAdvVO.class)
    @GetMapping("listadvertisement/noToken")
    public R listAdvertisement() {
        return communityService.listAdvertisement();
    public R listAdvertisement(@RequestParam(value = "type",required = false,defaultValue = "1") Integer type) {
        return communityService.listAdvertisement(type);
    }

    @ApiOperation(value = "分页通知列表", response = SysUserNoticeVO.class)
@@ -285,7 +285,7 @@
    @GetMapping("agreement")
    @ApiImplicitParam(name = "type", value = "1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策")
    public R agreement(@RequestParam("type") Integer type) {
        return userService.agreement(type);
        return userService.agreement(type,this.getAppId());
    }

    @ApiOperation("发布留言")
@@ -395,7 +395,9 @@
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            userId = loginUserInfo.getUserId();
            communityId = loginUserInfo.getCommunityId();
            if(loginUserInfo.getCommunityId()!=null){
                communityId = loginUserInfo.getCommunityId();
            }
        }
        return communityService.getUserReward(userId, communityId);
    }