党员认证通过后 添加党员徽章信息

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

@@ -23,7 +23,6 @@ import com.epmet.modules.feign.ResiGroupFeignClient;
 import com.epmet.modules.partymember.entity.*;
 import com.epmet.modules.partymember.redis.PartymemberInfoRedis;
 import com.epmet.modules.partymember.service.*;
-import com.epmet.modules.warmhearted.constant.ResiWarmUserMessageConstant;
 import com.epmet.modules.warmhearted.constant.ResiWarmheartedConstant;
 import com.epmet.modules.warmhearted.constant.ResiWarmheartedVisitConstant;
 import com.epmet.redis.ResiPartyMemberRedis;
@@ -250,6 +249,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			resiGroupFeignClient.updateWhenAuditedResiRole(identityParam);
 			//addby jianjun 2020-07-31 之前没有成功的返回结果
 			result = new Result<>().ok("注册成功");
+			//添加党员徽章信息
+			this.addUserPartyBadge(partyMemberInfoDTO.getUserId());
 		}
 
 		//将自动认证结果存入党员认证自动审核表
@@ -351,6 +352,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 				log.info(String.format("自动匹配失败,人工审核是党员,保存partymember_auth_record,userId=%s,党员库id=%s",partyMemberInfoEntity.getUserId(),partymemberConfirmAutoDTO.getPatryMemberBaseInfoId()));
 				partymemberAuthRecordService.insert(partyMemberInfoEntity,partymemberConfirmAutoDTO.getPatryMemberBaseInfoId());
 			}
+			//在徽章记录表中添加 徽章记录 表明此时已经认证通过可以点亮徽章了
+			addUserPartyBadge(partyMemberInfoEntity.getUserId());
 		} else {
 			auditMessageToResi(partyMemberInfoEntity, PartyMemberMessageConstant.AUDIT_REJECT_MSG);
 		}
@@ -359,6 +362,18 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		return new Result();
 	}
 
+	private void addUserPartyBadge(String partyUserId) {
+		if (StringUtils.isBlank(partyUserId)) {
+			throw new RenException("addUserPartyBadge，用户Id不能为空");
+		}
+		AddUserPartyBadgeFormDTO badgeFormDTO = new AddUserPartyBadgeFormDTO();
+		badgeFormDTO.setUserId(partyUserId);
+		Result<Boolean> result = epmetUserOpenFeignClient.addUserPartyBadgeRecord(badgeFormDTO);
+		if (result == null || !result.success() || !result.getData()) {
+			throw new RenException("初始化党员徽章信息失败");
+		}
+	}
+
 	@Override
 	public Result<AuditingDetailResultDTO> auditingDetail(AuditingDetailFromDTO fromDTO) {
 		AuditingDetailResultDTO resultDTO = new AuditingDetailResultDTO();

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

@@ -10,7 +10,10 @@ import com.epmet.dto.result.*;
 import com.epmet.feign.fallback.EpmetUserOpenFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -430,14 +433,23 @@ public interface EpmetUserOpenFeignClient {
      * @date 2020.11.10 15:59
      */
     @PostMapping("/epmetuser/badge/usershowbadge")
-     Result<Map<String,List<UserBadgeUnitFormDTO>>> userShowBadge(@RequestBody UserGroupFormDTO param);
+    Result<Map<String, List<UserBadgeUnitFormDTO>>> userShowBadge(@RequestBody UserGroupFormDTO param);
 
     /**
      * @param gridIdList
      * @author yinzuomei
-     * @description 根据网格id,查询每个网格有多少个徽章申请
+     * @description 根据网格id, 查询每个网格有多少个徽章申请
      * @Date 2020/11/12 15:41
      **/
-    @PostMapping(value = "/epmetuser/badge/querygridauditingbadgecount",consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value = "/epmetuser/badge/querygridauditingbadgecount", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<GridAuditingBadgeCountResultDTO>> queryGridAuditingBadgeCount(@RequestBody List<String> gridIdList);
+
+    /**
+     * @param formDTO
+     * @author yinzuomei
+     * @description 党员认证成功后 添加userBadge记录到数据库
+     * @Date 2020/11/12 15:41
+     **/
+    @PostMapping(value = "/epmetuser/more/badge/adduserpartybadgerecord")
+    Result<Boolean> addUserPartyBadgeRecord(@RequestBody AddUserPartyBadgeFormDTO formDTO);
 }

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

@@ -311,4 +311,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<List<GridAuditingBadgeCountResultDTO>> queryGridAuditingBadgeCount(List<String> gridIdList) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "queryGridAuditingBadgeCount", gridIdList);
     }
+
+    @Override
+    public Result<Boolean> addUserPartyBadgeRecord(AddUserPartyBadgeFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "addUserPartyBadgeRecord", formDTO);
+    }
 }