党员认证通过后放个调整

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -281,6 +281,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		baseInfo.setName(partyMemberInfoDTO.getName());
 
 		epmetUserOpenFeignClient.saveUserBaseInfo(baseInfo);
+
 		return result;
 	}
 
@@ -347,10 +348,10 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			identityParam.setPartyFlag(NumConstant.ONE_STR);
 			resiGroupFeignClient.updateWhenAuditedResiRole(identityParam);
 			//如果是自动匹配失败的，人工审核他是党员，需要记录党员库-居民的认证关系
-			PartymemberConfirmAutoDTO partymemberConfirmAutoDTO=partymemberConfirmAutoService.get(fromDTO.getAutoId());
+			PartymemberConfirmAutoDTO partymemberConfirmAutoDTO = partymemberConfirmAutoService.get(fromDTO.getAutoId());
-			if(partymemberConfirmAutoDTO!=null){
+			if (partymemberConfirmAutoDTO != null) {
-				log.info(String.format("自动匹配失败,人工审核是党员,保存partymember_auth_record,userId=%s,党员库id=%s",partyMemberInfoEntity.getUserId(),partymemberConfirmAutoDTO.getPatryMemberBaseInfoId()));
+				log.info(String.format("自动匹配失败,人工审核是党员,保存partymember_auth_record,userId=%s,党员库id=%s", partyMemberInfoEntity.getUserId(), partymemberConfirmAutoDTO.getPatryMemberBaseInfoId()));
-				partymemberAuthRecordService.insert(partyMemberInfoEntity,partymemberConfirmAutoDTO.getPatryMemberBaseInfoId());
+				partymemberAuthRecordService.insert(partyMemberInfoEntity, partymemberConfirmAutoDTO.getPatryMemberBaseInfoId());
 			}
 			//在徽章记录表中添加 徽章记录 表明此时已经认证通过可以点亮徽章了
 			addUserPartyBadge(partyMemberInfoEntity.getUserId());

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -450,6 +450,6 @@ public interface EpmetUserOpenFeignClient {
      * @description 党员认证成功后 添加userBadge记录到数据库
      * @Date 2020/11/12 15:41
      **/
-    @PostMapping(value = "/epmetuser/more/badge/adduserpartybadgerecord")
+    @PostMapping(value = "/epmetuser/more/badge/initbadge")
-    Result<Boolean> addUserPartyBadgeRecord(@RequestBody AddUserPartyBadgeFormDTO formDTO);
+    Result<Boolean> initBadge(@RequestBody AddUserPartyBadgeFormDTO formDTO);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -313,7 +313,7 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     }
 
     @Override
-    public Result<Boolean> addUserPartyBadgeRecord(AddUserPartyBadgeFormDTO formDTO) {
+    public Result<Boolean> initBadge(AddUserPartyBadgeFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "addUserPartyBadgeRecord", formDTO);
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "initBadge", formDTO);
     }
 }

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

@@ -113,30 +113,14 @@ public class UserBadgeController {
     }
 
     /**
-     * desc: 党员认证通过后，添加党员 徽章记录
+     * @Description 初始化党员徽章 或 党员认证通过后，添加党员 徽章记录
-     *
-     * @param tokenDto
-     * @param formDTO
-     * @return com.epmet.commons.tools.utils.Result
-     * @author LiuJanJun
-     * @date 2020/11/18 10:28 上午
-     */
-    @PostMapping("adduserpartybadgerecord")
-    public Result<Boolean> audit(@LoginUser TokenDto tokenDto, @RequestBody AddUserPartyBadgeFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
-        Boolean aBoolean = userBadgeService.addUserPartyBadgeRecord(tokenDto, formDTO);
-        return new Result().ok(aBoolean);
-    }
-
-    /**
-     * @Description  初始化党员徽章
      * @Param userId
      * @author zxc
      * @date 2020/11/18 下午3:03
      */
     @PostMapping("initbadge")
-    public Result initPartyMemberBadge(){
+    public Result initPartyMemberBadge(@RequestBody AddUserPartyBadgeFormDTO formDTO) {
-        userBadgeService.initPartyMemberBadge(null);
+        userBadgeService.initPartyMemberBadge(formDTO.getUserId());
         return new Result();
     }
 }

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

@@ -100,21 +100,10 @@ public interface UserBadgeService {
     Map<String,List<UserBadgeInfoResultDTO>> getBatchUserSortedBadge(String customerId, List<String> userIds);
 
     /**
-     * @Description  初始化党员徽章
+     * @Description 初始化党员徽章 或审核通过后 添加用户党员徽章记录
      * @Param userId
      * @author zxc
      * @date 2020/11/18 下午3:03
      */
     void initPartyMemberBadge(String userId);
-
-    /**
-     * desc: 添加用户党员徽章记录
-     *
-     * @param tokenDto
-     * @param formDTO
-     * @return java.lang.Boolean
-     * @author LiuJanJun
-     * @date 2020/11/18 10:32 上午
-     */
-    Boolean addUserPartyBadgeRecord(TokenDto tokenDto, AddUserPartyBadgeFormDTO formDTO);
 }

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

@@ -29,7 +29,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -385,32 +384,4 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         return badges.stream().collect(Collectors.groupingBy(UserBadgeInfoResultDTO::getUserId));
     }
 
-    /**
-     * desc: 添加用户党员徽章记录
-     *
-     * @param tokenDto
-     * @param formDTO
-     * @return java.lang.Boolean
-     * @author LiuJanJun
-     * @date 2020/11/18 10:32 上午
-     */
-    @Override
-    public Boolean addUserPartyBadgeRecord(TokenDto tokenDto, AddUserPartyBadgeFormDTO formDTO) {
-        String badgeId = badgeDao.getPartyBadgeId(tokenDto.getCustomerId());
-        ResiUserBadgeDTO resiUserBadgeDTO = new ResiUserBadgeDTO();
-        resiUserBadgeDTO.setCustomerId(tokenDto.getCustomerId());
-        resiUserBadgeDTO.setBadgeId(badgeId);
-        UserBaseInfoResultDTO userInfo = userBaseInfoService.queryUserBaseInfoFromCache(formDTO.getUserId());
-        if (userInfo == null) {
-            log.error("获取用户信息失败");
-            return false;
-        }
-        resiUserBadgeDTO.setGridId(userInfo.getRegisteredGridId());
-        resiUserBadgeDTO.setUserId(formDTO.getUserId());
-        resiUserBadgeDTO.setIsOpened(NumConstant.ONE);
-        resiUserBadgeDTO.setCertificationAutidStatus(BadgeConstant.APPROVED);
-        resiUserBadgeDao.insertResiUserBadge(Arrays.asList(resiUserBadgeDTO));
-        return true;
-    }
-
 }