From 58cb88a494fe654f781e4002bc110e6756c0c862 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期六, 08 五月 2021 10:17:32 +0800
Subject: [PATCH] no
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 50 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 36 insertions(+), 14 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 a3b6b1e..601a96d 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
@@ -4,6 +4,8 @@
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.applets.weixin.CheckService;
import com.panzhihua.applets.model.dtos.ComPbMemberCertificationDTO;
+import com.panzhihua.common.constants.UserConstants;
+import com.panzhihua.common.model.dtos.shop.ExcelShopOrderDTO;
import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.community.*;
@@ -21,15 +23,14 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
+import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
/**
@@ -328,7 +329,7 @@
@ApiOperation(value = "党员认证")
@PostMapping("partybuildingembercertification")
public R partybuildingembercertification(@RequestBody @Validated(AddGroup.class) ComPbMemberCertificationDTO comPbMemberCertificationDTO) {
- //totest 党员认证
+ //党员认证
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
Long communityId = loginUserInfo.getCommunityId();
@@ -340,19 +341,27 @@
R certUser = partyBuildingService.userCertification(userId);
Object certUserInfo = certUser.getData();
- boolean userCertified = false;
- if (certUserInfo != null) {
- PartyBuildingMemberVO certUserVo = (PartyBuildingMemberVO) certUserInfo;
- //已认证党员身份，直接返回
- userCertified = certUserVo.getAuditResult() == 1;
+ AtomicBoolean userCertified = new AtomicBoolean(false);
+ if (R.isOk(certUser) && certUserInfo != null) {
+ try {
+ List<PartyBuildingMemberVO> partyBuildingMemberVOList = JSONArray.parseArray(JSONArray.toJSONString(certUser.getData()), PartyBuildingMemberVO.class);
+ //已认证党员身份，直接返回
+ if(partyBuildingMemberVOList!=null && partyBuildingMemberVOList.size()>0) {
+ partyBuildingMemberVOList.forEach(vo -> {
+ userCertified.set(vo.getAuditResult() == 1);
+ });
+ }
+ }catch (Exception e){}
}
//匹配手机，验证是否进行自动确认
- if (userCertified) {
- return R.fail("用户已完成党员认证");
+ if (userCertified.get()) {
+ return R.fail("您已审核通过，无需重复提交");
}
PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO();
BeanUtils.copyProperties(comPbMemberCertificationDTO, partyBuildingMemberVO);
+ partyBuildingMemberVO.setAuditResult(0);
+ partyBuildingMemberVO.setCommunityId(communityId);
//用户实名认证信息判断
String idCard = loginUserInfo.getIdCard();
@@ -371,10 +380,23 @@
@ApiOperation(value = "党员认证查询")
@GetMapping("partybuildingembercertification")
public R partybuildingembercertification() {
- //totest 党员认证查询
+ //党员认证查询
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
- return partyBuildingService.userCertification(userId);
+ R r = partyBuildingService.userCertification(userId);
+
+ if(R.isOk(r)) {
+ List<PartyBuildingMemberVO> partyBuildingMemberVOList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), PartyBuildingMemberVO.class);
+ if(partyBuildingMemberVOList!=null && partyBuildingMemberVOList.size()>0){
+ Optional<PartyBuildingMemberVO> ot = partyBuildingMemberVOList.stream().filter(partyBuildingMemberVO -> partyBuildingMemberVO.getAuditResult()==1).findFirst();
+ if(ot.isPresent()){
+ return R.ok(ot.get());
+ }else{
+ return R.ok(partyBuildingMemberVOList.get(0));
+ }
+ }
+ }
+ return R.ok();
}
--
Gitblit v1.7.1