From 2b6c540c6b20e04f8b2a05e6f0c22ba5d5016364 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期六, 24 九月 2022 14:09:50 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
index a77135f..95f3a8c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
@@ -65,6 +65,7 @@
if (loginUserInfo != null) {
comActEasyPhotoVO.setCommunityId(loginUserInfo.getCommunityId());
comActEasyPhotoVO.setLogInUserId(loginUserInfo.getUserId());
+ comActEasyPhotoVO.setIsDpcMember(loginUserInfo.getIsDpcMember());
}
return communityService.pageEasyPhotoApplets(comActEasyPhotoVO);
}
@@ -115,6 +116,13 @@
@PostMapping("/editEasyPhotoHandler")
public R editEasyPhotoHandler(@RequestBody EditComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
return this.communityService.editEasyPhotoHandler(comActEasyPhotoHandler);
+ }
+
+ @ApiOperation(value = "查询处理详情", response = ComActEasyPhotoHandlerVo.class)
+ @ApiImplicitParam(name = "id", value = "处理id", required = true)
+ @GetMapping("/easyPhotoHandler")
+ public R detailEasyPhotoHandler(@RequestParam("id") Long id) {
+ return this.communityService.detailEasyPhotoHandler(id);
}
@ApiOperation(value = "查询随手拍是否有活动", response = ComActEasyPhotoActivityVO.class)
@@ -246,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)
@@ -277,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("发布留言")
@@ -387,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);
}
--
Gitblit v1.7.1