Merge branch 'feat-20220615-yeejinyuan' into temp-pre

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mq/GigSignCertReceiver.java

@@ -306,25 +306,18 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 		}
 
 		// 处理同时发起时另一个渠道需要的补发情况 TODO
-		// 查询requestId
-		SysUserSub userSub = sysUserSubService.getOne(Wrappers.<SysUserSub>lambdaQuery()
-				.eq(SysUserSub::getUserId, user.getUserId())
-				.eq(SysUserSub::getGigType, GigTypeEnum.OLADING)
-				.eq(SysUserSub::getCertStatus, Integer.parseInt(OladingCertStatus.CERT.getCode())));
-		if (userSub != null) {
-			// 查询redis是否有同时发起的标记
-			String redisKey = CacheConstants.OLADING_SEND_BOTH_CHANNEL + userSub.getRequestId();
-			Object userId = redisTemplate.opsForValue().get(redisKey);
-			if (userId != null) {
-				// 如果同一人同时存在海南飞亿、金园数科的渠道，则补发一次(由于阿拉钉同一人不同渠道的回调只有一次，所以这里需要补发)
-				log.info("=============================补发阿拉钉另一渠道MQ4==================================");
-				UserSignCertDTO reCertDTO = new UserSignCertDTO();
-				reCertDTO.setUserId(userSub.getUserId());
-				reCertDTO.setGigTypeList(Collections.singletonList(GigTypeEnum.JIN_YUAN));
-				sysUserSignCertService.batchChannelCert(reCertDTO);
-				// 删除redis key
-				redisTemplate.delete(redisKey);
-			}
+		// 查询redis是否有同时发起的标记
+		String redisKey = CacheConstants.OLADING_SEND_BOTH_CHANNEL + user.getUserId();
+		Object userId = redisTemplate.opsForValue().get(redisKey);
+		if (userId != null) {
+			// 如果同一人同时存在海南飞亿、金园数科的渠道，则补发一次(由于阿拉钉同一人不同渠道的回调只有一次，所以这里需要补发)
+			log.info("=============================补发阿拉钉另一渠道MQ4==================================");
+			UserSignCertDTO reCertDTO = new UserSignCertDTO();
+			reCertDTO.setUserId(user.getUserId());
+			reCertDTO.setGigTypeList(Collections.singletonList(GigTypeEnum.JIN_YUAN));
+			sysUserSignCertService.batchChannelCert(reCertDTO);
+			// 删除redis key
+			redisTemplate.delete(redisKey);
 		}
 	}
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/gig/impl/SysUserSignCertServiceImpl.java

@@ -387,7 +387,7 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 				if (userSignCertDTO.getGigTypeList().containsAll(CollUtil.toList(GigTypeEnum.OLADING, GigTypeEnum.JIN_YUAN))) {
 					// 记录同时选择了阿拉钉金园数科、海南飞亿渠道，用来标记其在海南飞亿认证完后需要被发起
 					// 即，同时选择了阿拉钉金园数科、海南飞亿渠道，则先发起海南飞亿认证，完成之后再发起金园数科认证
-					String redisKey = CacheConstants.OLADING_SEND_BOTH_CHANNEL + requestId;
+					String redisKey = CacheConstants.OLADING_SEND_BOTH_CHANNEL + sysUser.getUserId();
 					redisTemplate.opsForValue().set(redisKey, sysUser.getUserId());
 					return false;
 				}