springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.panzhihua.applets.weixin.CheckService; import com.panzhihua.applets.model.dtos.ComPbMemberCertificationDTO; 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.*; @@ -26,10 +27,8 @@ 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; /** @@ -340,16 +339,20 @@ R certUser = partyBuildingService.userCertification(userId); Object certUserInfo = certUser.getData(); boolean userCertified = false; if (certUserInfo != null) { AtomicBoolean userCertified = new AtomicBoolean(false); if (R.isOk(certUser) && certUserInfo != null) { try { PartyBuildingMemberVO certUserVo = JSONObject.parseObject(JSONObject.toJSONString(certUser.getData()), PartyBuildingMemberVO.class); List<PartyBuildingMemberVO> partyBuildingMemberVOList = JSONArray.parseArray(JSONArray.toJSONString(certUser.getData()), PartyBuildingMemberVO.class); //已认证党员身份，直接返回 userCertified = certUserVo.getAuditResult() == 1; if(partyBuildingMemberVOList!=null && partyBuildingMemberVOList.size()>0) { partyBuildingMemberVOList.forEach(vo -> { userCertified.set(vo.getAuditResult() == 1); }); } }catch (Exception e){} } //匹配手机，验证是否进行自动确认 if (userCertified) { if (userCertified.get()) { return R.fail("您已审核通过，无需重复提交"); } @@ -378,7 +381,20 @@ //党员认证查询 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(); }
@@ -29,7 +29,7 @@ @ApiModelProperty("消息标题") private String title; @ApiModelProperty("具体业务类型 1 社区活动 2党建活动 3微心愿通知 4随手拍服务通知 5支援者申请 6实名制审核 7人脸识别审核 8积分获取和消耗 9积分点击直接跳转积分列表 10 房屋审核通知") @ApiModelProperty("具体业务类型 1 社区活动 2党建活动 3微心愿通知 4随手拍服务通知 5支援者申请 6实名制审核 7人脸识别审核 8积分获取和消耗 9积分点击直接跳转积分列表 10 房屋审核通知 11 党员认证审核通知") private Integer businessType; @ApiModelProperty("业务标题") springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
@@ -15,6 +15,7 @@ import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActDynVO; import com.panzhihua.common.model.vos.community.ComActMessageVO; import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO; import com.panzhihua.common.model.vos.community.ResetComActMessageVO; @@ -31,7 +32,6 @@ import com.panzhihua.community_backstage.model.dto.PartyBuildingMemberDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import javassist.expr.NewArray; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.util.ObjectUtils; @@ -558,11 +558,52 @@ } R updated = partyBuildingService.updatePartyBuildingMember(partyBuildingMemberVO); //审核通过： 修改用户的党员状态 if((1==partyBuildingMemberVO.getAuditResult()) && R.isOk(updated) ) { return userService.updateUserIsPartymember(updated.getData().toString()); }else if(0==partyBuildingMemberVO.getAuditResult() && R.isOk(updated)){ return userService.updateUserNotPartymember(updated.getData().toString()); if(R.isOk(updated)) { PartyBuildingMemberVO vo1 = JSONObject.parseObject(JSONObject.toJSONString(updated.getData()), PartyBuildingMemberVO.class); Long userId = vo1.getUserId(); Long memId = partyBuildingMemberVO.getId(); String userIdcard = vo1.getIdCard(); if ((1 == partyBuildingMemberVO.getAuditResult()) && R.isOk(updated)) { R r = userService.updateUserIsPartymember(userIdcard); if (R.isOk(r)) { SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO(); sysUserNoticeVO.setUserId(userId); sysUserNoticeVO.setType(3); sysUserNoticeVO.setTitle("党员认证申请审核通过"); sysUserNoticeVO.setBusinessType(11); sysUserNoticeVO.setBusinessTitle(" "); sysUserNoticeVO.setBusinessContent("你提交的党员认证申请已被审核通过"); sysUserNoticeVO.setBusinessId(memId); sysUserNoticeVO.setStatus(0); sysUserNoticeVO.setBusinessStatus(2); R r1 = userService.addNotice(sysUserNoticeVO); if (R.isOk(r1)) { log.info("新增党员认证已被审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO)); } } return r; } else if (0 == partyBuildingMemberVO.getAuditResult() && R.isOk(updated)) { R r = userService.updateUserNotPartymember(userIdcard); if (R.isOk(r)) { SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO(); sysUserNoticeVO.setUserId(userId); sysUserNoticeVO.setType(3); sysUserNoticeVO.setTitle("党员认证申请被驳回"); sysUserNoticeVO.setBusinessType(11); sysUserNoticeVO.setBusinessTitle(" "); sysUserNoticeVO.setBusinessContent("你提交的党员认证申请已被驳回"); sysUserNoticeVO.setBusinessId(memId); sysUserNoticeVO.setStatus(0); sysUserNoticeVO.setBusinessStatus(1); R r1 = userService.addNotice(sysUserNoticeVO); if (R.isOk(r1)) { log.info("新增党员认证已被审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO)); } } return r; } } return updated; } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
@@ -512,8 +512,8 @@ */ @GetMapping("usercertification") R userCertification(@RequestParam("id")Long id){ ComPbMemberDO comPbMemberDO = comPbMemberService.getOne(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getUserId, id).eq(ComPbMemberDO::getAuditResult, 1)); return R.ok(comPbMemberDO); List<ComPbMemberDO> comPbMemberDOList = comPbMemberService.list(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getUserId, id)); return R.ok(comPbMemberDOList); }
@@ -206,7 +206,8 @@ */ @Override public R listPartyMember(Long communityId) { List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getCommunityId,communityId)); List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda() .eq(ComPbMemberDO::getCommunityId,communityId).eq(ComPbMemberDO::getAuditResult, 1)); // 查询社区所有已经注册的党员 // 排除掉已经成为党委的党员 // List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectListRegister(communityId); @@ -510,7 +511,9 @@ comPbMemberDO.setUpdateAt(new Date()); } if (comPbMemberDAO.updateById(comPbMemberDO) > 0) { return R.ok(comPbMemberDO.getIdCard()); PartyBuildingMemberVO rtVO = new PartyBuildingMemberVO(); BeanUtils.copyProperties(comPbMemberDO, rtVO); return R.ok(rtVO); } return R.fail(); }
