feat: 1.查询多渠道认证状态；2.修复更新报错

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

@@ -749,6 +749,16 @@ public class ApiController {
 				// 认证服务信息回显
 				List<SysUserSub> userSignCertList = sysUserSignCertService.listUserSignCert(sysU.getUserId());
 				mapOne.put("certList", userSignCertList);
+				// 是否需要人身认证
+				if (CollUtil.isNotEmpty(userSignCertList)) {
+					long personalIdentityCount = userSignCertList.stream()
+							.filter(sysUserSub -> StrUtil.isAllNotBlank(sysUserSub.getIdCardFrontUrl(),
+									sysUserSub.getIdCardBackUrl(), sysUserSub.getCertVideo1Url(), sysUserSub.getCertVideo2Url()))
+							.count();
+					mapOne.put("isPersonalIdentity", personalIdentityCount > 0);
+				} else {
+					mapOne.put("isPersonalIdentity", false);
+				}
 
 				list.add(mapOne);
 

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

@@ -71,12 +71,14 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 	@Override
 	public void saveBaseInfo(UserSignCertDTO userSignCertDTO) {
 		Integer operateUserId = SecurityUtils.getUser().getId();
-		// 更新用户信息
-		SysUser updateUser = new SysUser();
-		updateUser.setUserId(userSignCertDTO.getUserId());
-		updateUser.setIdCardNumber(userSignCertDTO.getIdCardNumber());
+		if (StrUtil.isNotBlank(userSignCertDTO.getIdCardNumber())) {
+			// 更新用户信息
+			SysUser updateUser = new SysUser();
+			updateUser.setUserId(userSignCertDTO.getUserId());
+			updateUser.setIdCardNumber(userSignCertDTO.getIdCardNumber());
 //		updateUser.setBankCardNumber(userSignCertDTO.getBankCardNumber());
-		sysUserService.updateById(updateUser);
+			sysUserService.updateById(updateUser);
+		}
 		// 更新用户签约认证主体信息
 		userSignCertDTO.getGigTypeList().forEach(gigType -> {
 			SysUserSub userSub = new SysUserSub();
@@ -120,9 +122,9 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 	public void signAgreement(UserSignCertDTO userSignCertDTO) {
 		LambdaUpdateWrapper<SysUserSub> updateWrapper = Wrappers.lambdaUpdate();
 		updateWrapper.eq(SysUserSub::getUserId, userSignCertDTO.getUserId());
-//		if (CollUtil.isNotEmpty(userSignCertDTO.getGigTypeList())) {
-//			updateWrapper.in(SysUserSub::getGigType, userSignCertDTO.getGigTypeList());
-//		}
+		if (CollUtil.isNotEmpty(userSignCertDTO.getGigTypeList())) {
+			updateWrapper.in(SysUserSub::getGigType, userSignCertDTO.getGigTypeList());
+		}
 		updateWrapper.set(SysUserSub::getAgreementUrl, userSignCertDTO.getAgreementUrl());
 		updateWrapper.set(SysUserSub::getUpdateUser, SecurityUtils.getUser().getId());
 		updateWrapper.set(SysUserSub::getUpdateTime, LocalDateTime.now());
@@ -139,9 +141,9 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 	public void personalIdentityVerification(UserSignCertDTO userSignCertDTO) {
 		LambdaUpdateWrapper<SysUserSub> updateWrapper = Wrappers.lambdaUpdate();
 		updateWrapper.eq(SysUserSub::getUserId, userSignCertDTO.getUserId());
-		if (CollUtil.isNotEmpty(userSignCertDTO.getGigTypeList())) {
-			updateWrapper.in(SysUserSub::getGigType, userSignCertDTO.getGigTypeList());
-		}
+//		if (CollUtil.isNotEmpty(userSignCertDTO.getGigTypeList())) {
+//			updateWrapper.in(SysUserSub::getGigType, userSignCertDTO.getGigTypeList());
+//		}
 		updateWrapper.set(SysUserSub::getIdCardFrontUrl, userSignCertDTO.getIdCardFrontUrl());
 		updateWrapper.set(SysUserSub::getIdCardBackUrl, userSignCertDTO.getIdCardBackUrl());
 		updateWrapper.set(SysUserSub::getCertVideo1Url, userSignCertDTO.getCertVideo1Url());
@@ -167,7 +169,7 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 		List<SysUserSub> userSubList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
 				.eq(SysUserSub::getUserId, userId));
 		if (CollUtil.isNotEmpty(userSubList)) {
-			// 封装请求数据
+			// 封装请求数据 TODO 只把未认证或认证失败的发起认证
 			BaseMap gigInfo = new BaseMap();
 			userSubList.forEach(userSub -> {
 				// 基础信息
@@ -197,14 +199,6 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 						? null : upmsConfig.getClientUrl() + userSub.getCertVideo1Url());
 				userInfoModel.setCertVideo2(StrUtil.isBlank(userSub.getCertVideo2Url())
 						? null : upmsConfig.getClientUrl() + userSub.getCertVideo2Url());
-//				userInfoModel.setIdCardFront(StrUtil.isBlank(userSub.getIdCardFrontUrl())
-//						? null : Base64Util.picToBase64(upmsConfig.getClientUrl() + userSub.getIdCardFrontUrl()));
-//				userInfoModel.setIdCardBack(StrUtil.isBlank(userSub.getIdCardBackUrl())
-//						? null : Base64Util.picToBase64(upmsConfig.getClientUrl() + userSub.getIdCardBackUrl()));
-//				userInfoModel.setCertVideo1(StrUtil.isBlank(userSub.getCertVideo1Url())
-//						? null : Base64Util.videoToBase64(upmsConfig.getClientUrl() + userSub.getCertVideo1Url()));
-//				userInfoModel.setCertVideo2(StrUtil.isBlank(userSub.getCertVideo2Url())
-//						? null : Base64Util.videoToBase64(upmsConfig.getClientUrl() + userSub.getCertVideo2Url()));
 
 				GigInfoModel infoModel = new GigInfoModel();
 				infoModel.setBaseInfo(baseInfoModel);