From a7d2d03fe177a58c22e960e9c87b32f7b05be74f Mon Sep 17 00:00:00 2001
From: CeDo <cedoo@qq.com>
Date: 星期六, 01 五月 2021 22:57:48 +0800
Subject: [PATCH] add:添加小程序实名认证接口过滤(部分)

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 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 cec81ac..7ab3706 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
@@ -18,6 +18,7 @@
 import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
 import com.panzhihua.common.model.vos.shop.ShopStoreVO;
 import com.panzhihua.common.model.vos.user.*;
+import com.panzhihua.common.service.partybuilding.PartyBuildingService;
 import com.panzhihua.common.utlis.IdCard;
 import com.panzhihua.common.utlis.RealNameUtil;
 import com.panzhihua.common.utlis.SensitiveUtil;
@@ -194,6 +195,7 @@
         loginUserInfoVO.setStatus(sysUserDO.getStatus());
         loginUserInfoVO.setAccount(name);
         loginUserInfoVO.setType(sysUserDO.getType());
+        loginUserInfoVO.setIsRealNamed(sysUserDO.getIdCard()!=null);//暂时 身份证判断实名制
         List<SysRoleDO> roleDOList = roleDAO.selectByUserId(sysUserDO.getUserId());
         Set<String> set = new HashSet<>();
         if (!ObjectUtils.isEmpty(roleDOList)) {
@@ -251,6 +253,7 @@
                 loginUserInfoVO.setIsmemberrole(1);
             }
         }
+        loginUserInfoVO.setIsRealNamed(sysUserDO.getIdCard()!=null);
         return R.ok(loginUserInfoVO);
     }
 
@@ -603,6 +606,14 @@
         }
         int update = userDao.updateById(sysUserDO);
         if (update > 0) {
+            //实名认证成功查询是否有已审核的党员信息,有则更新党员信息绑定党员的userId
+            Long memberId = userDao.getPartyBuildingByIdCard(idCard);
+            if(memberId != null){
+                sysUserDO.setIsPartymember(1);
+                userDao.updateById(sysUserDO);
+                //修改审核绑定的userId
+                userDao.updateComPbMemberUserId(idCard,sysUserDO.getUserId());
+            }
             return R.ok();
         }
         return R.fail();
@@ -712,11 +723,12 @@
      * @return 成员集合
      */
     @Override
-    public R listFamily(Long userId) {
+    public R listFamily(Long userId,Long pageNum, Long pageSize) {
         List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = new ArrayList<>();
-        List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO.selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
-        if (!ObjectUtils.isEmpty(comMngFamilyInfoDOS)) {
-            comMngFamilyInfoDOS.forEach(comMngFamilyInfoDO -> {
+        LambdaQueryWrapper<ComMngFamilyInfoDO> query = new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId);
+        IPage<ComMngFamilyInfoDO> pageData = comMngFamilyInfoDAO.selectPage(new Page<>(pageNum,pageSize), query);
+        if (!ObjectUtils.isEmpty(pageData.getRecords())) {
+            pageData.getRecords().forEach(comMngFamilyInfoDO -> {
                 ComMngFamilyInfoVO comMngFamilyInfoVO = new ComMngFamilyInfoVO();
                 BeanUtils.copyProperties(comMngFamilyInfoDO, comMngFamilyInfoVO);
                 comMngFamilyInfoVOS.add(comMngFamilyInfoVO);
@@ -1408,14 +1420,13 @@
      */
     @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) {
+        SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard,idCard).eq(SysUserDO::getType,1));
+        if(sysUserDO != null){
+            sysUserDO.setIsPartymember(1);
+            userDao.updateById(sysUserDO);
             log.info("新增党员修改用户党员状态成功 身份证号【{}】", idCard);
-            return R.ok();
         }
-        return R.fail();
+        return R.ok();
     }
 
     /**

--
Gitblit v1.7.1