fix: 发起认证人力家callbackstatus被修改

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

@@ -117,9 +117,6 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 							break;
 						case REN_LI_JIA:
 							// TODO
-							// 本次结果存入redis
-							redisTemplate.opsForValue().set(CacheConstants.USER_SIGN_CERT_RESPONSE_KEY + user.getUserId(),
-									JSONUtil.toJsonStr(subjectTypes), 1, TimeUnit.MINUTES);
 							break;
 						case OLADING:
 							oladingHandler(user, dept, subjectResult);

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

@@ -320,7 +320,6 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 				SysUserSub updateUserSub = new SysUserSub();
 				updateUserSub.setId(userSub.getId());
 				updateUserSub.setRequestId(requestId);
-				updateUserSub.setGigType(userSub.getGigType());
 				updateUserSub.setCallbackStatus(GigCallBackStatus.IN_PROGRESS);
 				sysUserSubService.updateById(updateUserSub);
 				// 发送mq
@@ -528,32 +527,37 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 			throw new RuntimeException("数据异常");
 		}
 		BaseMap gigInfo = new BaseMap();
-		userSubList.forEach(userSub -> {
-			// 新银行卡号缓存到redis
-			String cacheKey = String.format("%s_%s_%s", CacheConstants.BIND_CARD_CONFIRM_NEW_BANK_CARD, userSub.getUserId(), userSub.getGigType().name());
-			redisTemplate.opsForValue().set(cacheKey, userSignCertDTO);
-
-			// 查询user
-			SysUser sysUser = sysUserService.getById(userSignCertDTO.getUserId());
-			// 查询dept
-			SysDept dept = sysDeptService.getById(sysUser.getDeptId());
-			// 封装请求数据
-			if (GigTypeEnum.TAX_HELPOR.equals(userSub.getGigType())) {
-				gigInfo.put(userSub.getGigType().name(),
-						this.buildTaxHelperBindCardConfirmModel(sysUser, userSub, dept.getTaxCode(), userSignCertDTO.getBankCardNumber(), userSignCertDTO.getVerifyCode()));
-			} else if (GigTypeEnum.YEE.equals(userSub.getGigType())) {
-				gigInfo.put(userSub.getGigType().name(),
-						this.buildYeeBindCardConfirmModel(sysUser, userSub, dept.getTaxCode(), userSignCertDTO.getBankCardNumber()));
-			} else if (GigTypeEnum.OLADING.equals(userSub.getGigType())) {
-				gigInfo.put(userSub.getGigType().name(),
-						this.buildOladingBindCardConfirmModel(sysUser, userSub, dept.getTaxCode(), userSignCertDTO.getBankCardNumber()));
-			}
-			// 更新为进行中状态
-			SysUserSub updateUserSub = new SysUserSub();
-			updateUserSub.setId(userSub.getId());
-			updateUserSub.setCallbackStatus(GigCallBackStatus.IN_PROGRESS);
-			sysUserSubService.updateById(updateUserSub);
-		});
+		userSubList.stream()
+				// 人力家暂过滤掉
+				.filter(sysUserSub -> !GigTypeEnum.REN_LI_JIA.equals(sysUserSub.getGigType()))
+				.forEach(userSub -> {
+					// 新银行卡号缓存到redis
+					String cacheKey = String.format("%s_%s_%s", CacheConstants.BIND_CARD_CONFIRM_NEW_BANK_CARD, userSub.getUserId(), userSub.getGigType().name());
+					redisTemplate.opsForValue().set(cacheKey, userSignCertDTO);
+
+					// 查询user
+					SysUser sysUser = sysUserService.getById(userSignCertDTO.getUserId());
+					// 查询dept
+					SysDept dept = sysDeptService.getById(sysUser.getDeptId());
+					// 封装请求数据
+					if (GigTypeEnum.TAX_HELPOR.equals(userSub.getGigType())) {
+						gigInfo.put(userSub.getGigType().name(),
+								this.buildTaxHelperBindCardConfirmModel(sysUser, userSub, dept.getTaxCode(), userSignCertDTO.getBankCardNumber(), userSignCertDTO.getVerifyCode()));
+					} else if (GigTypeEnum.YEE.equals(userSub.getGigType())) {
+						gigInfo.put(userSub.getGigType().name(),
+								this.buildYeeBindCardConfirmModel(sysUser, userSub, dept.getTaxCode(), userSignCertDTO.getBankCardNumber()));
+					} else if (GigTypeEnum.OLADING.equals(userSub.getGigType())) {
+						gigInfo.put(userSub.getGigType().name(),
+								this.buildOladingBindCardConfirmModel(sysUser, userSub, dept.getTaxCode(), userSignCertDTO.getBankCardNumber()));
+					}
+					// 更新为进行中状态
+					SysUserSub updateUserSub = new SysUserSub();
+					updateUserSub.setId(userSub.getId());
+					updateUserSub.setCallbackStatus(GigCallBackStatus.IN_PROGRESS);
+					updateUserSub.setUpdateTime(LocalDateTime.now());
+					updateUserSub.setUpdateUser(0);
+					sysUserSubService.updateById(updateUserSub);
+				});
 
 		if (CollUtil.isNotEmpty(gigInfo)) {
 			// 发送mq