Merge branch 'dev_party_mange'

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserRoleResultDTO.java

@@ -0,0 +1,19 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2022/5/31 9:44
+ */
+@Data
+public class IcUserRoleResultDTO implements Serializable  {
+    private static final long serialVersionUID = 6755574567711827403L;
+    /**
+     * 是否是志愿者0否，1是
+     */
+    private String isVolunteer;
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -1147,4 +1147,18 @@ public class IcResiUserController implements ResultDataResolver {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         return new Result<IcResiUserInfoDTO>().ok(icResiUserService.getUserByIdCard(formDTO));
     }
+
+    /**
+     * 根据身份证获取居民角色（目前只有是否是志愿者）
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link Result<IcUserRoleResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/5/31 9:47
+     */
+    @PostMapping("getUserRoleByIdCard")
+    public Result<IcUserRoleResultDTO> getUserRoleByIdCard(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        return new Result<IcUserRoleResultDTO>().ok(icResiUserService.getUserRoleByIdCard(formDTO));
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@@ -374,4 +374,14 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * @Date 2022/5/20 9:59
      */
     IcResiUserInfoDTO getUserByIdCard(IcResiUserDTO formDTO);
+
+    /**
+     * 根据身份证获取居民角色（目前只有是否是志愿者）
+     *
+     * @Param formDTO
+     * @Return {@link IcUserRoleResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2022/5/31 9:50
+     */
+    IcUserRoleResultDTO getUserRoleByIdCard(IcResiUserDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -50,6 +50,7 @@ import com.epmet.constant.UserConstant;
 import com.epmet.dao.IcPartyMemberDao;
 import com.epmet.dao.IcResiUserDao;
 import com.epmet.dao.IcVolunteerDao;
+import com.epmet.dao.UserBaseInfoDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
@@ -139,6 +140,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     private IcVolunteerDao icVolunteerDao;
     @Resource
     private ResiPartyMemberOpenFeignClient resiPartyMemberOpenFeignClient;
+    @Resource
+    private EpmetHeartOpenFeignClient epmetHeartOpenFeignClient;
+    @Resource
+    private UserBaseInfoDao userBaseInfoDao;
 
     private QueryWrapper<IcResiUserEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
@@ -2261,6 +2266,42 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         return result;
     }
 
+    /**
+     * 根据身份证获取居民角色（目前只有是否是志愿者）
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link IcUserRoleResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2022/5/31 9:50
+     */
+    @Override
+    public IcUserRoleResultDTO getUserRoleByIdCard(IcResiUserDTO formDTO) {
+        IcUserRoleResultDTO result = new IcUserRoleResultDTO();
+        result.setIsVolunteer(NumConstant.ZERO_STR);
+        //根据身份证获取小程序端居民信息
+        LambdaQueryWrapper<UserBaseInfoEntity> baseInfoWrapper = new LambdaQueryWrapper<>();
+        baseInfoWrapper.eq(UserBaseInfoEntity::getCustomerId, formDTO.getCustomerId());
+        baseInfoWrapper.eq(UserBaseInfoEntity::getIdNum, formDTO.getIdCard());
+        List<UserBaseInfoEntity> baseInfoList = userBaseInfoDao.selectList(baseInfoWrapper);
+        if (CollectionUtils.isNotEmpty(baseInfoList)) {
+            for (UserBaseInfoEntity baseInfo : baseInfoList) {
+                //获取志愿者信息
+                Result<VolunteerInfoDTO> volunteerResult = epmetHeartOpenFeignClient.queryUserVolunteerInfo(baseInfo.getUserId());
+                if (!volunteerResult.success()) {
+                    log.error("志愿者变更-获取小程序志愿者失败");
+                    continue;
+                }
+                if (null != volunteerResult.getData()) {
+                    result.setIsVolunteer(NumConstant.ONE_STR);
+                    break;
+                }
+            }
+        }
+
+        return result;
+    }
+
     /**
      * desc:根据字段值获取 options
      * @param customerId

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java

@@ -355,13 +355,15 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl<IcVolunteerPolyD
                 LambdaQueryWrapper<UserBaseInfoEntity> baseInfoWrapper = new LambdaQueryWrapper<>();
                 baseInfoWrapper.eq(UserBaseInfoEntity::getCustomerId, customerId);
                 baseInfoWrapper.eq(UserBaseInfoEntity::getIdNum, icUser.getIdCard());
-                UserBaseInfoEntity baseInfo = userBaseInfoDao.selectOne(baseInfoWrapper);
+                List<UserBaseInfoEntity> baseInfoList = userBaseInfoDao.selectList(baseInfoWrapper);
-                if (null != baseInfo) {
+                if (CollectionUtils.isNotEmpty(baseInfoList)) {
-                    ResiVolunteerAuthenticateFormDTO formDTO = new ResiVolunteerAuthenticateFormDTO();
+                    baseInfoList.forEach(baseInfo -> {
-                    formDTO.setCustomerId(customerId);
+                        ResiVolunteerAuthenticateFormDTO formDTO = new ResiVolunteerAuthenticateFormDTO();
-                    formDTO.setUserId(baseInfo.getUserId());
+                        formDTO.setCustomerId(customerId);
-                    formDTO.setGridId(icUser.getGridId());
+                        formDTO.setUserId(baseInfo.getUserId());
-                    epmetHeartOpenFeignClient.addVolunteer(formDTO);
+                        formDTO.setGridId(icUser.getGridId());
+                        epmetHeartOpenFeignClient.addVolunteer(formDTO);
+                    });
                 }
             } else {
                 if (!isDyzxh) {