From 1ebc39cb6c5f043f5824748b82107dbb15f0c180 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期五, 15 一月 2021 15:39:35 +0800
Subject: [PATCH] 小程序志愿者申请状态字段增加
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index a710a76..65e0c3c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -13,8 +13,10 @@
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.*;
+import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
import com.panzhihua.common.model.vos.user.*;
+import com.panzhihua.common.utlis.RealNameUtil;
import com.panzhihua.service_user.dao.*;
import com.panzhihua.service_user.model.dos.*;
import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
@@ -213,6 +215,17 @@
set.add(sysRoleDO.getRoleKey());
});
loginUserInfoVO.setRoles(set);
+ }
+// 志愿者状态
+ String phone = sysUserDO.getPhone();
+ if (!ObjectUtils.isEmpty(phone)) {
+ ComMngVolunteerMngVO comMngVolunteerMngVO= userDao.selectVolunteerMngByPhone(phone);
+ if (ObjectUtils.isEmpty(comMngVolunteerMngVO)) {
+ loginUserInfoVO.setVolunteerStatus(0);
+ }else{
+ int state = comMngVolunteerMngVO.getState().intValue();
+ loginUserInfoVO.setVolunteerStatus(state);
+ }
}
return R.ok(loginUserInfoVO);
}
@@ -465,16 +478,23 @@
*/
@Override
public R putUserAuthentication(LoginUserInfoVO loginUserInfoVO) {
+ //接入第三方实名认证
+ String idCard = loginUserInfoVO.getIdCard();
+ String name = loginUserInfoVO.getName();
+ boolean b = RealNameUtil.authentication(idCard, name);
+ if (!b) {
+ return R.fail("身份认证失败：公安系统认证错误");
+ }
SysUserDO sysUserDO=new SysUserDO();
- sysUserDO.setName(loginUserInfoVO.getName());
- sysUserDO.setIdCard(loginUserInfoVO.getIdCard());
+ sysUserDO.setName(name);
+ sysUserDO.setIdCard(idCard);
sysUserDO.setSex(loginUserInfoVO.getSex());
sysUserDO.setBirthday(loginUserInfoVO.getBirthday());
sysUserDO.setJob(loginUserInfoVO.getJob());
sysUserDO.setUserId(loginUserInfoVO.getUserId());
sysUserDO.setFaceUrl(loginUserInfoVO.getFaceUrl());
sysUserDO.setFaceState(0);
- SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard, loginUserInfoVO.getIdCard()));
+ SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard, idCard));
if (!ObjectUtils.isEmpty(sysUserDO1)) {
return R.fail("身份证已经存在");
}
@@ -1234,6 +1254,24 @@
return R.fail();
}
+ /**
+ * 修改用户的党员状态
+ *
+ * @param idCard 身份证号
+ * @return 修改结果
+ */
+ @Override
+ public R updateUserIsPartymember(String idCard) {
+ SysUserDO sysUserDO=new SysUserDO();
+ sysUserDO.setIsPartymember(1);
+ int update = userDao.update(sysUserDO, new UpdateWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard, idCard));
+ if (update>0) {
+ log.info("新增党员修改用户党员状态成功 身份证号【{}】",idCard);
+ return R.ok();
+ }
+ return R.fail();
+ }
+
public static void main(String[] args) {
String encode = new BCryptPasswordEncoder().encode("admin123456");
System.out.println(encode);
--
Gitblit v1.7.1