From ed9e98f6b71bf662c045fd8e24d6ac254f624051 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 15 七月 2024 13:28:58 +0800
Subject: [PATCH] 花城 【小程序】后台添加了组织社区共建内容，但小程序端没有显示内容
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 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 246e70b..22304f4 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
@@ -26,6 +26,7 @@
import com.panzhihua.common.service.community.ComActEasyPhotoEvaluateFeign;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.common.validated.PageGroup;
import io.swagger.annotations.Api;
@@ -61,7 +62,7 @@
public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
if (loginUserInfo != null) {
- comActEasyPhotoVO.setCommunityId(loginUserInfo.getCommunityId());
+// comActEasyPhotoVO.setCommunityId(loginUserInfo.getCommunityId());
comActEasyPhotoVO.setLogInUserId(loginUserInfo.getUserId());
comActEasyPhotoVO.setIsDpcMember(loginUserInfo.getIsDpcMember());
}
@@ -172,6 +173,25 @@
}
return communityService.detailEasyPhoto(id, userId);
}
+
+
+ /**
+ * 随手拍删除
+ *
+ * @param id
+ * 随手拍主键
+ * 登录用户id
+ * @return 详情内容
+ */
+ @ApiOperation(value = "删除随手拍", response = ComActEasyPhotoVO.class)
+ @DeleteMapping("easyphoto/{id}")
+ public R deleteEasyPhoto(@PathVariable("id") Long id) {
+ Long userId = this.getUserId();
+ return communityService.deleteEasyPhoto(id, userId);
+ }
+
+
+
@ApiOperation(value = "随手拍详情-脱敏", response = ComActEasyPhotoVO.class)
@GetMapping("detailEasyPhotoDesensitize")
@ApiImplicitParam(name = "id", value = "随手拍主键")
@@ -251,11 +271,17 @@
@ApiOperation(value = "分页展示社区微心愿", response = ComActMicroWishVO.class)
@PostMapping("pagemicrowish")
- public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
+ public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO)
+ {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
if (loginUserInfo != null) {
comActMicroWishVO.setCommunityId(loginUserInfo.getCommunityId());
comActMicroWishVO.setResponsibleId(loginUserInfo.getUserId());// 责任人暂时放登录用户id
+ }
+
+ if(!StringUtils.isEmpty(comActMicroWishVO.getHandleId()))
+ {
+ comActMicroWishVO.setCommunityId(null);
}
comActMicroWishVO.setIsApplets(1);
comActMicroWishVO.setIsPageMyWish(null);
@@ -314,6 +340,14 @@
}
return communityService.detailMicroWish(id, userId);
}
+
+
+ @ApiOperation(value = "删除心愿")
+ @PostMapping("deletemicrowish")
+ public R deleteMicrowish(@RequestParam("id") Long id) {
+ return communityService.deletemicrowish(id);
+ }
+
@ApiOperation(value = "心愿详情-脱敏", response = ComActMicroWishVO.class)
@GetMapping("microwishDesensitize")
@@ -507,6 +541,18 @@
return communityService.getUserRewards(userId, communityId);
}
+ @ApiOperation(value = "获取普达首页弹窗接口", response = ComActEasyPhotoRewardVO.class)
+ @GetMapping("getUserRewardsNew")
+ public R getUserRewardsNew(@RequestParam("communityId") Long communityId) {
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ communityId = loginUserInfo.getCommunityId();
+ }
+ return communityService.getUserRewardsNew(userId, communityId);
+ }
+
@ApiOperation(value = "读取用户随手拍奖励")
@PostMapping("readUserReward")
public R readUserReward() {
--
Gitblit v1.7.1