From 2bc69b919ef626e6093d598d7eae07c8f9e3e0e4 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 14 一月 2022 10:56:51 +0800
Subject: [PATCH] 仁和东区代码提交
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index f6e172c..f61b1d0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -6,12 +6,14 @@
import java.util.Comparator;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
import javax.annotation.Resource;
+import com.panzhihua.common.constants.HttpStatus;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -96,8 +98,22 @@
Object data = r.getData();
if (!ObjectUtils.isEmpty(data)) {
LoginUserInfoVO loginUserInfoVO = (LoginUserInfoVO)data;
+ //是否保存unionid
+// if (Objects.isNull(loginUserInfoVO.getUnionid()) || "无".equals(loginUserInfoVO.getUnionid())) {
+// return R.fail(HttpStatus.UNAUTHORIZED, "token过期");
+// }
R r1 = communityService.detailHouse(userId);
- R r4=communityService.selectByIdCard(loginUserInfoVO.getIdCard());
+ if(StringUtils.isNotEmpty(loginUserInfoVO.getIdCard())){
+ //查询实名用户绑定的实有人口地址
+ R r4=communityService.selectByIdCard(loginUserInfoVO.getIdCard());
+ if(R.isOk(r4)){
+ String address= (String) r4.getData();
+ if(StringUtils.isNotEmpty(address)){
+ loginUserInfoVO.setAddress(address);
+ r.setData(loginUserInfoVO);
+ }
+ }
+ }
if (null != communityId && 0 != communityId) {
R r2 = communityService.detailCommunity(communityId);
if (R.isOk(r2)) {
@@ -124,13 +140,6 @@
Object data1 = r1.getData();
if (!ObjectUtils.isEmpty(data1)) {
loginUserInfoVO.setComMngStructHouseVOS((List<ComMngStructHouseVO>)data1);
- r.setData(loginUserInfoVO);
- }
- }
- if(R.isOk(r4)){
- String address= (String) r4.getData();
- if(StringUtils.isNotEmpty(address)){
- loginUserInfoVO.setAddress(address);
r.setData(loginUserInfoVO);
}
}
@@ -261,12 +270,12 @@
@ApiOperation(value = "我的活动", response = ComActActivityVO.class)
@ApiImplicitParam(name = "status", value = "活动状态（4 进行中 5 已结束 6 已取消）", required = false)
@GetMapping("listactivity")
- public R listActivity(@RequestParam("status") Integer status) {
+ public R listActivity(@RequestParam(value = "status", required = false) Integer status) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
Long communityId = loginUserInfo.getCommunityId();
List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
- R r = communityService.listActivity(userId);
+ R r = communityService.listActivity(userId, status);
if (R.isOk(r)) {
comActActivityVOS = (List<ComActActivityVO>)r.getData();
}
--
Gitblit v1.7.1