feat: 阿拉钉、金园数科认证结果

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

@@ -269,13 +269,26 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 	private void oladingHandler(SysUser user, SysDept dept, JSONObject subjectResult) {
 
 		// 处理阿拉钉-海南飞亿
-		oladingChannelHandler(user, dept, subjectResult, GigTypeEnum.OLADING);
+		Map<String, String> o1Map = oladingChannelHandler(user, dept, subjectResult, GigTypeEnum.OLADING);
 
 		// 处理阿拉钉-金园数科
-		oladingChannelHandler(user, dept, subjectResult, GigTypeEnum.JIN_YUAN);
+		Map<String, String> o2Map = oladingChannelHandler(user, dept, subjectResult, GigTypeEnum.JIN_YUAN);
+
+		// 结果放到redis
+		Map<String, Object> resultMap = new HashMap<>();
+		if (o1Map != null) {
+			resultMap.put(GigTypeEnum.OLADING.name(), o1Map);
+		}
+		if (o2Map != null) {
+			resultMap.put(GigTypeEnum.JIN_YUAN.name(), o2Map);
+		}
+		if (CollUtil.isNotEmpty(resultMap)) {
+			String key = CacheConstants.USER_SIGN_CERT_RESPONSE_KEY + user.getUserId();
+			redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(resultMap), 1, TimeUnit.MINUTES);
+		}
 	}
 
-	private void oladingChannelHandler(SysUser user, SysDept dept, JSONObject subjectResult, GigTypeEnum gigType) {
+	private Map<String, String> oladingChannelHandler(SysUser user, SysDept dept, JSONObject subjectResult, GigTypeEnum gigType) {
 		String certStatus = subjectResult.getStr("certStatus");
 		String uploadTaxPayerAgreementStatus = subjectResult.getStr("uploadTaxPayerAgreementStatus");
 		LocalDateTime now = LocalDateTime.now();
@@ -312,11 +325,8 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 			updateUser.setUserId(user.getUserId());
 			updateUser.setUpdateTime(now);
 			sysUserService.updateById(updateUser);
-			// 结果放到redis
-			String key = CacheConstants.USER_SIGN_CERT_RESPONSE_KEY + userSub.getUserId();
-			Map<String, Object> result = MapUtil.newHashMap(1);
-			result.put(gigType.name(), subMap);
-			redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(result), 1, TimeUnit.MINUTES);
+
+			return subMap;
 		}
 		// 已认证，则设置回调状态
 		if (OladingCertStatus.CERT.getCode().equals(String.valueOf(userSub.getCertStatus()))) {
@@ -325,6 +335,8 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 
 		sysUserSubService.update(updateWrapper);
 		// 如果是核身视频回调，则同步该账号的易联-金园数科渠道认证状态 TODO
+
+		return null;
 	}
 
 }

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

@@ -405,7 +405,8 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 		// 结果放到redis
 		String key = CacheConstants.USER_SIGN_CERT_RESPONSE_KEY + userSub.getUserId();
 		Map<String, Object> result = MapUtil.newHashMap(1);
-		result.put(userSub.getGigType().name(), subMap);
+		result.put(GigTypeEnum.OLADING.name(), subMap);
+		result.put(GigTypeEnum.JIN_YUAN.name(), subMap);
 		redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(result), 1, TimeUnit.MINUTES);
 
 		// 如果成功，则发送核身视频上传MQ