feat: 签约认证获取mq结果、绑卡银行卡必填

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

@@ -155,6 +155,9 @@ public class SysUserSignCertController {
 		if (StrUtil.isBlank(userSignCertDTO.getBankPhone())) {
 			return R.failed("银行预留手机号不能为空");
 		}
+		if (StrUtil.isBlank(userSignCertDTO.getBankCardNumber())) {
+			return R.failed("银行卡号不能为空");
+		}
 		sysUserSignCertService.bindCardConfirm(userSignCertDTO);
 
 		return R.ok();

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

@@ -81,7 +81,12 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 						// 根据不同渠道，更新对应的签约认证状态
 						subjectTypes.forEach((s, o) -> {
 							GigTypeEnum gigTypeEnum = Enum.valueOf(GigTypeEnum.class, s);
-							JSONObject statusResult = (JSONObject) o;
+							JSONObject subjectResult = (JSONObject) o;
+//							String code = subjectResult.getStr("code");
+//							String message = subjectResult.getStr("message");
+							String certStatus = subjectResult.getStr("certStatus");
+							String stageResult = JSONUtil.toJsonStr(subjectResult.getJSONObject("stageResult"));
+
 							LocalDateTime now = LocalDateTime.now();
 							// 拼接更新条件
 							LambdaUpdateWrapper<SysUserSub> updateWrapper = Wrappers.<SysUserSub>lambdaUpdate()
@@ -89,16 +94,16 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 									.eq(SysUserSub::getDeptId, dept.getDeptId())
 									.set(SysUserSub::getUpdateTime, now)
 									.set(SysUserSub::getUpdateUser, 0)
-									.set(SysUserSub::getCertRemark, statusResult.getStr("message"));
+									.set(SysUserSub::getCertRemark, stageResult);
 							switch (gigTypeEnum) {
 								case TAX_HELPOR:
-									TaxHelperCertStatus taxHelperCertStatus = Enum.valueOf(TaxHelperCertStatus.class, statusResult.getStr("certStatus"));
+									TaxHelperCertStatus taxHelperCertStatus = Enum.valueOf(TaxHelperCertStatus.class, certStatus);
 									updateWrapper.eq(SysUserSub::getGigType, GigTypeEnum.TAX_HELPOR);
 									updateWrapper.set(SysUserSub::getCertStatus, taxHelperCertStatus.getCode());
 									break;
 								case REN_LI_JIA:
 									// TODO
-									RenlijiaCertStatus renlijiaCertStatus = Enum.valueOf(RenlijiaCertStatus.class, statusResult.getStr("certStatus"));
+									RenlijiaCertStatus renlijiaCertStatus = Enum.valueOf(RenlijiaCertStatus.class, certStatus);
 									updateWrapper.eq(SysUserSub::getGigType, GigTypeEnum.REN_LI_JIA);
 									updateWrapper.set(SysUserSub::getCertStatus, renlijiaCertStatus.getCode());
 									break;
@@ -106,7 +111,7 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 									// TODO
 									break;
 								case YEE:
-									YeeCertStatus yeeCertStatus = Enum.valueOf(YeeCertStatus.class, statusResult.getStr("certStatus"));
+									YeeCertStatus yeeCertStatus = Enum.valueOf(YeeCertStatus.class, certStatus);
 									updateWrapper.eq(SysUserSub::getGigType, GigTypeEnum.YEE);
 									updateWrapper.set(SysUserSub::getCertStatus, yeeCertStatus.getCode());
 									break;

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

@@ -328,8 +328,10 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 			SysUserSub updateUserSub = new SysUserSub();
 			updateUserSub.setId(userSub.getId());
 			updateUserSub.setBankPhone(userSignCertDTO.getBankPhone());
+			updateUserSub.setBankCardNumber(userSignCertDTO.getBankCardNumber());
 			sysUserSubService.updateById(updateUserSub);
 			userSub.setBankPhone(userSignCertDTO.getBankPhone());
+			userSub.setBankCardNumber(userSignCertDTO.getBankCardNumber());
 			// 查询user
 			SysUser sysUser = sysUserService.getById(userSignCertDTO.getUserId());
 			// 查询dept