From 5c42840d8d607ef07e5902a8ef4ac8b9587ed775 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 6 Jan 2022 10:40:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/VolunteerInfoServiceImpl.java        | 19 +++++++++++--------
 .../main/resources/mapper/UserResiInfoDao.xml |  1 +
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
index e66b5734fb..71417dbb2e 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
@@ -146,7 +146,17 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
                 throw new RenException(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
             }
         }
-        // 2、检查是否是志愿者
+        //2、志愿者认证，更新用户基础信息user_base_info+自动注册居民
+        VolunteerRegResiFormDTO param = ConvertUtils.sourceToTarget(formDTO, VolunteerRegResiFormDTO.class);
+        Result regResi = epmetUserOpenFeignClient.volunteerAutoRegResi(param);
+        if (!regResi.success()) {
+            logger.warn(String.format("userId:%s,认证志愿者时，自动注册居民失败，返参:%s", formDTO.getUserId(), JSON.toJSONString(regResi)));
+            if (regResi.getCode() > 8000) {
+                throw new RenException(regResi.getCode(), regResi.getMsg());
+            }
+            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), regResi.getMsg());
+        }
+        // 3、检查是否是志愿者
         VolunteerInfoDTO originVolunteer = baseDao.selectVolunteerInfoByUserId(formDTO.getUserId());
         if (null != originVolunteer) {
             //能修改的只有这两个属性，像是网格id,网格名称，pid,pids不允许修改，第一次注册成功后不可修改
@@ -177,13 +187,6 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
             // 2.3发送消息 由积分系统消费消息（需要使用规则）
             this.grantActPoints(formDTO);
         }
-        //3、志愿者认证，更新用户基础信息user_base_info+自动注册居民
-        VolunteerRegResiFormDTO param = ConvertUtils.sourceToTarget(formDTO, VolunteerRegResiFormDTO.class);
-        Result regResi=epmetUserOpenFeignClient.volunteerAutoRegResi(param);
-        if(!regResi.success()){
-            logger.warn(String.format("userId:%s,认证志愿者时，自动注册居民失败，返参:%s",formDTO.getUserId(), JSON.toJSONString(regResi)));
-            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), regResi.getMsg());
-        }
     }
 
     private void grantActPoints(ResiVolunteerAuthenticateFormDTO formDTO){
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
index 8078b4a959..102f9611ac 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
@@ -106,6 +106,7 @@
         uri.DEL_FLAG = '0'
         AND uri.REG_MOBILE = #{regMobile,jdbcType=VARCHAR}
         AND uc.CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
+        AND uri.CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
         AND uc.IS_REGISTER = 1
     </select>