fix: 返回redis认证结果

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

@@ -285,7 +285,7 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 			redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(qResultObj), 1, TimeUnit.MINUTES);
 		} else {
 			Map<String, Object> result = MapUtil.newHashMap(2);
-			result.put(currentCertStatus.name(), new HashMap<>(subMap));
+			result.put(userSub.getGigType().name(), new HashMap<>(subMap));
 			redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(result), 1, TimeUnit.MINUTES);
 		}
 
@@ -332,6 +332,7 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 
 		Map<String, String> subMap = new HashMap<>();
 		LambdaUpdateWrapper<SysUserSub> updateUserSubWrapper = Wrappers.lambdaUpdate();
+		updateUserSubWrapper.eq(SysUserSub::getId, userSub.getId());
 		OladingCertStatus currentCertStatus;
 		if (OladingCommonRequest.UploadIdCardImageStatus.IDENTIFY_SUCCESS.equals(uploadIdCertStatus)) {
 			subMap.put("certStatus", OladingCertStatus.SIGNED.name());
@@ -344,11 +345,6 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 			updateUserSubWrapper.set(SysUserSub::getIdCardBackUrl, null);
 			currentCertStatus = OladingCertStatus.SIGNED;
 		}
-		updateUserSubWrapper.eq(SysUserSub::getUserId, userSub.getUserId());
-		updateUserSubWrapper.eq(SysUserSub::getDeptId, userSub.getDeptId());
-		// 同时修改自由职家、金园数科的状态和数据
-		updateUserSubWrapper.in(SysUserSub::getGigType, GigTypeEnum.OLADING, GigTypeEnum.JIN_YUAN);
-		updateUserSubWrapper.ne(SysUserSub::getCertStatus, Integer.parseInt(OladingCertStatus.CERT.getCode()));
 		updateUserSubWrapper.set(SysUserSub::getUpdateTime, LocalDateTime.now());
 		updateUserSubWrapper.set(SysUserSub::getUpdateUser, 0);
 		updateUserSubWrapper.set(SysUserSub::getCallbackStatus, GigCallBackStatus.RETURNED);
@@ -369,7 +365,7 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 			redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(qResultObj), 1, TimeUnit.MINUTES);
 		} else {
 			Map<String, Object> result = MapUtil.newHashMap(2);
-			result.put(currentCertStatus.name(), new HashMap<>(subMap));
+			result.put(userSub.getGigType().name(), new HashMap<>(subMap));
 			redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(result), 1, TimeUnit.MINUTES);
 		}
 
@@ -380,21 +376,6 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 			userSignCertDTO.setUserId(userSub.getUserId());
 			userSignCertDTO.setGigTypeList(Collections.singletonList(userSub.getGigType()));
 			sysUserSignCertService.batchChannelCert(userSignCertDTO);
-
-//			// 查询是否存在另一渠道需要发起（海南飞亿、金园数科其中之一）
-//			SysUserSub secUserSub = sysUserSubService.getOne(Wrappers.<SysUserSub>lambdaQuery()
-//					.eq(SysUserSub::getUserId, userSub.getUserId())
-//					.in(SysUserSub::getGigType, GigTypeEnum.OLADING, GigTypeEnum.JIN_YUAN)
-//					.eq(SysUserSub::getCertStatus, Integer.parseInt(OladingCertStatus.SIGNING.getCode()))
-//					.ne(SysUserSub::getId, userSub.getId()));
-//			if (secUserSub != null) {
-//				// 如果同一人同时存在海南飞亿、金园数科的渠道，则补发一次(由于阿拉钉同一人不同渠道的回调只有一次，所以这里需要补发)
-//				log.info("=============================补发阿拉钉另一渠道MQ2==================================");
-//				UserSignCertDTO reCertDTO = new UserSignCertDTO();
-//				reCertDTO.setUserId(secUserSub.getUserId());
-//				reCertDTO.setGigTypeList(Collections.singletonList(secUserSub.getGigType()));
-//				sysUserSignCertService.batchChannelCert(reCertDTO);
-//			}
 		}
 	}
 
@@ -417,6 +398,7 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 		Map<String, String> subMap = new HashMap<>();
 		OladingCertStatus currentCertStatus;
 		LambdaUpdateWrapper<SysUserSub> updateUserSubWrapper = Wrappers.lambdaUpdate();
+		updateUserSubWrapper.eq(SysUserSub::getId, userSub.getId());
 		if (OladingCommonRequest.UploadTaxpayerAgreementStatus.SUCCESS.equals(agreementStatus)) {
 			subMap.put("certStatus", OladingCertStatus.CERT.name());
 			updateUserSubWrapper.set(SysUserSub::getCertStatus, Integer.valueOf(OladingCertStatus.CERT.getCode()));
@@ -426,11 +408,6 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 			updateUserSubWrapper.set(SysUserSub::getCertStatus, Integer.valueOf(OladingCertStatus.SIGNED.getCode()));
 			currentCertStatus = OladingCertStatus.SIGNED;
 		}
-		updateUserSubWrapper.eq(SysUserSub::getUserId, userSub.getUserId());
-		updateUserSubWrapper.eq(SysUserSub::getDeptId, userSub.getDeptId());
-		// 同时修改自由职家、金园数科的状态和数据
-		updateUserSubWrapper.in(SysUserSub::getGigType, GigTypeEnum.OLADING, GigTypeEnum.JIN_YUAN);
-		updateUserSubWrapper.ne(SysUserSub::getCertStatus, Integer.parseInt(OladingCertStatus.CERT.getCode()));
 		updateUserSubWrapper.set(SysUserSub::getUpdateTime, LocalDateTime.now());
 		updateUserSubWrapper.set(SysUserSub::getUpdateUser, 0);
 		updateUserSubWrapper.set(SysUserSub::getCallbackStatus, GigCallBackStatus.RETURNED);
@@ -451,7 +428,7 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 			redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(qResultObj), 1, TimeUnit.MINUTES);
 		} else {
 			Map<String, Object> result = MapUtil.newHashMap(2);
-			result.put(currentCertStatus.name(), new HashMap<>(subMap));
+			result.put(userSub.getGigType().name(), new HashMap<>(subMap));
 			redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(result), 1, TimeUnit.MINUTES);
 		}
 
@@ -463,21 +440,6 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 			userSignCertDTO.setGigTypeList(Collections.singletonList(userSub.getGigType()));
 			userSignCertDTO.setUploadFaceID(true);
 			sysUserSignCertService.batchChannelCert(userSignCertDTO);
-
-//			// 查询是否存在另一渠道需要发起（海南飞亿、金园数科其中之一）
-//			SysUserSub secUserSub = sysUserSubService.getOne(Wrappers.<SysUserSub>lambdaQuery()
-//					.eq(SysUserSub::getUserId, userSub.getUserId())
-//					.in(SysUserSub::getGigType, GigTypeEnum.OLADING, GigTypeEnum.JIN_YUAN)
-//					.eq(SysUserSub::getCertStatus, Integer.parseInt(OladingCertStatus.SIGNING.getCode()))
-//					.ne(SysUserSub::getId, userSub.getId()));
-//			if (secUserSub != null) {
-//				// 如果同一人同时存在海南飞亿、金园数科的渠道，则补发一次(由于阿拉钉同一人不同渠道的回调只有一次，所以这里需要补发)
-//				log.info("=============================补发阿拉钉另一渠道MQ3==================================");
-//				UserSignCertDTO reCertDTO = new UserSignCertDTO();
-//				reCertDTO.setUserId(secUserSub.getUserId());
-//				reCertDTO.setGigTypeList(Collections.singletonList(secUserSub.getGigType()));
-//				sysUserSignCertService.batchChannelCert(reCertDTO);
-//			}
 		}
 	}
 }