Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev

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

@@ -19,19 +19,18 @@ import com.epmet.constant.ReadFlagConstant;
 import com.epmet.constant.SmsTemplateConstant;
 import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dao.*;
+import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.ResiUserBadgeDTO;
 import com.epmet.dto.UserBadgeCertificateRecordDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
+import com.epmet.entity.BadgeEntity;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.redis.UserBadgeRedis;
 import com.epmet.redis.UserBaseInfoRedis;
-import com.epmet.service.ResiUserBadgeService;
-import com.epmet.service.UserBadgeCertificateRecordService;
-import com.epmet.service.UserBadgeService;
-import com.epmet.service.UserBaseInfoService;
+import com.epmet.service.*;
 import com.epmet.util.ModuleConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -280,6 +279,18 @@ public class UserBadgeServiceImpl implements UserBadgeService {
                 return new Result().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
             }
         }
+        // 0309:如果是党员徽章去判断居民信息-类别是否是党员
+        BadgeEntity badgeEntity = badgeDao.selectById(certificationAddFormDTO.getBadgeId());
+        if (null == badgeEntity) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "徽章信息查询异常", "徽章信息查询异常");
+        }
+        if (BadgeConstant.PARTY.equals(badgeEntity.getFixationBadgeType())) {
+            // 如果是党员徽章，去查看居民信息-类别
+            IcResiUserDTO icResiUserDTO = SpringContextUtils.getBean(IcResiUserService.class).getByResiId(certificationAddFormDTO.getIdcard());
+            if (null != icResiUserDTO && NumConstant.ONE_STR.equals(icResiUserDTO.getIsParty())) {
+                certificationAddFormDTO.setAutoPassFlag(true);
+            }
+        }
         UserBadgeCertificateRecordDTO form = ConvertUtils.sourceToTarget(certificationAddFormDTO, UserBadgeCertificateRecordDTO.class);
         List<String> userIds = new ArrayList<>();
         userIds.add(certificationAddFormDTO.getUserId());

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -476,7 +476,8 @@
             mobile,
             agency_id,
             grid_id,
-            home_id
+            home_id,
+            IS_PARTY as isParty
         FROM
             ic_resi_user
         WHERE