From 2cd6667778d28f6bf3aaa25ac8deed35201b77ef Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 07 五月 2021 09:19:50 +0800
Subject: [PATCH] 创建订单返回订单

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 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 bcb4fd7..ec39c50 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;
@@ -587,7 +588,7 @@
         log.info("用户实名认证发送请求,姓名:" + name + "身份证号码:" + idCard);
         boolean b = RealNameUtil.authentication(idCard, name);
         if (!b) {
-            return R.fail("身份认证失败:公安系统认证错误");
+            return R.fail("身份认证失败:请填写真实信息");
         }
         SysUserDO sysUserDO = new SysUserDO();
         sysUserDO.setName(name);
@@ -604,6 +605,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();
@@ -1368,6 +1377,7 @@
     @Override
     public R indexDataCommunityBackstage(Long communityId) {
         IndexDataVO indexDataVO = userDao.indexDataCommunityBackstage(communityId);
+        //查询后台党员数量
         return R.ok(indexDataVO);
     }
 
@@ -1410,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