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

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserSignCertController.java

@@ -63,7 +63,7 @@ public class SysUserSignCertController {
 		if (StrUtil.isBlank(userSignCertDTO.getBankPhone()) || !Validator.isMobile(userSignCertDTO.getBankPhone())) {
 			return R.failed("银行预留手机号不正确");
 		}
-		if (StrUtil.length(userSignCertDTO.getBankCardNumber()) < 16) {
+		if (StrUtil.length(userSignCertDTO.getBankCardNumber()) < 16 || StrUtil.length(userSignCertDTO.getBankCardNumber()) > 19) {
 			return R.failed("银行卡号不正确");
 		}
 		SysUser sysUser = new SysUser();
@@ -92,7 +92,7 @@ public class SysUserSignCertController {
 		if (StrUtil.isBlank(userSignCertDTO.getBankPhone()) || !Validator.isMobile(userSignCertDTO.getBankPhone())) {
 			return R.failed("银行预留手机号不正确");
 		}
-		if (StrUtil.length(userSignCertDTO.getBankCardNumber()) < 16) {
+		if (StrUtil.length(userSignCertDTO.getBankCardNumber()) < 16 || StrUtil.length(userSignCertDTO.getBankCardNumber()) > 19) {
 			return R.failed("银行卡号不正确");
 		}
 		if (StrUtil.isNotBlank(userSignCertDTO.getIdCardNumber()) && !Validator.isCitizenId(userSignCertDTO.getIdCardNumber())) {

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

@@ -322,6 +322,8 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 				reCertDTO.setUserId(userSub.getUserId());
 				reCertDTO.setGigTypeList(Collections.singletonList(GigTypeEnum.JIN_YUAN));
 				sysUserSignCertService.batchChannelCert(reCertDTO);
+				// 删除redis key
+				redisTemplate.delete(redisKey);
 			}
 		}
 	}
@@ -363,7 +365,6 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 		if (OladingCommonRequest.SignUpStatus.SIGN.name().equals(certStatus)
 				&& !OladingCertStatus.CERT.getCode().equals(String.valueOf(userSub.getCertStatus()))) {
 			// 如果是已上传协议成功，则设置为已认证，否则还是已签约
-			SysUser updateUser = new SysUser();
 			if (OladingCommonRequest.UploadTaxpayerAgreementStatus.SUCCESS.name().equals(uploadTaxPayerAgreementStatus)) {
 				updateWrapper.set(SysUserSub::getCertStatus, Integer.parseInt(OladingCertStatus.CERT.getCode()));
 				certStatusMap.put("certStatus", OladingCertStatus.CERT.name());
@@ -372,10 +373,6 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 				certStatusMap.put("certStatus", OladingCertStatus.SIGNED.name());
 			}
 			updateWrapper.set(SysUserSub::getCallbackStatus, GigCallBackStatus.RETURNED);
-			// 修改步进状态
-			updateUser.setUserId(user.getUserId());
-			updateUser.setUpdateTime(now);
-			sysUserService.updateById(updateUser);
 		}
 		// 如果是签约中，则判断'阿拉丁签约方法'状态
 		if (OladingCommonRequest.SignUpStatus.SIGNING.name().equals(certStatus)) {