feat: 接口增加gigTypeList参数

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

@@ -31,8 +31,6 @@ public class SysUserSignCertController {
 
 	private final SysUserSignCertService sysUserSignCertService;
 
-	private final RedisTemplate redisTemplate;
-
 	/**
 	 * 保存用户基础信息
 	 *
@@ -68,6 +66,13 @@ public class SysUserSignCertController {
 		if (StrUtil.isBlank(userSignCertDTO.getAgreementUrl())) {
 			return R.failed("协议不能为空");
 		}
+		if (CollUtil.isEmpty(userSignCertDTO.getGigTypeList())) {
+			return R.failed("认证渠道不能为空");
+		}
+		List<SysUserSub> userSubList = sysUserSignCertService.listUserSignCert(userSignCertDTO.getUserId(), userSignCertDTO.getGigTypeList());
+		if (CollUtil.isEmpty(userSubList)) {
+			return R.failed("数据异常");
+		}
 		sysUserSignCertService.signAgreement(userSignCertDTO);
 
 		return R.ok();
@@ -89,16 +94,14 @@ public class SysUserSignCertController {
 				userSignCertDTO.getCertVideo1Url(), userSignCertDTO.getCertVideo2Url())) {
 			return R.failed("身份证或视频信息不能为空");
 		}
-		List<SysUserSub> userSubList = sysUserSignCertService.listUserSignCert(userSignCertDTO.getUserId());
-		if (CollUtil.isNotEmpty(userSubList)) {
-			SysUserSub sysUserSub = userSubList.get(0);
-			// 如果进行过人身认证，则可以跳过
-			if (!StrUtil.isAllNotBlank(sysUserSub.getIdCardFrontUrl(), sysUserSub.getIdCardBackUrl(),
-					sysUserSub.getCertVideo1Url(), sysUserSub.getCertVideo2Url())) {
-				sysUserSignCertService.personalIdentityVerification(userSignCertDTO);
-				return R.ok("已人身验证");
-			}
+		if (CollUtil.isEmpty(userSignCertDTO.getGigTypeList())) {
+			return R.failed("认证渠道不能为空");
+		}
+		List<SysUserSub> userSubList = sysUserSignCertService.listUserSignCert(userSignCertDTO.getUserId(), userSignCertDTO.getGigTypeList());
+		if (CollUtil.isEmpty(userSubList)) {
+			return R.failed("数据异常");
 		}
+		sysUserSignCertService.personalIdentityVerification(userSignCertDTO);
 
 		return R.ok();
 	}
@@ -115,6 +118,13 @@ public class SysUserSignCertController {
 		if (userSignCertDTO.getUserId() == null) {
 			return R.failed("userId不能为空");
 		}
+		if (CollUtil.isEmpty(userSignCertDTO.getGigTypeList())) {
+			return R.failed("认证渠道不能为空");
+		}
+		List<SysUserSub> userSubList = sysUserSignCertService.listUserSignCert(userSignCertDTO.getUserId(), userSignCertDTO.getGigTypeList());
+		if (CollUtil.isEmpty(userSubList)) {
+			return R.failed("数据异常");
+		}
 		sysUserSignCertService.batchChannelCert(userSignCertDTO);
 
 		return R.ok();
@@ -158,6 +168,9 @@ public class SysUserSignCertController {
 		if (StrUtil.isBlank(userSignCertDTO.getBankCardNumber())) {
 			return R.failed("银行卡号不能为空");
 		}
+		if (CollUtil.isEmpty(userSignCertDTO.getGigTypeList())) {
+			return R.failed("认证渠道不能为空");
+		}
 		sysUserSignCertService.bindCardConfirm(userSignCertDTO);
 
 		return R.ok();

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

@@ -3,6 +3,7 @@ package com.qunzhixinxi.hnqz.admin.service.gig;
 import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
 import com.qunzhixinxi.hnqz.admin.entity.dto.UserSignCertDTO;
 import com.qunzhixinxi.hnqz.admin.entity.vo.SysUserSubVO;
+import com.qunzhixinxi.hnqz.admin.enums.GigTypeEnum;
 
 import java.util.List;
 
@@ -22,6 +23,15 @@ public interface SysUserSignCertService {
 	 */
 	List<SysUserSub> listUserSignCert(Integer userId);
 
+	/**
+	 * 查询用户签约认证信息
+	 *
+	 * @param userId
+	 * @param gigTypeList
+	 * @return
+	 */
+	List<SysUserSub> listUserSignCert(Integer userId, List<GigTypeEnum> gigTypeList);
+
 	/**
 	 * 查询用户签约认证信息
 	 *

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

@@ -79,6 +79,21 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 		return userSubList;
 	}
 
+	/**
+	 * 查询用户签约认证信息
+	 *
+	 * @param userId
+	 * @param gigTypeList
+	 * @return
+	 */
+	@Override
+	public List<SysUserSub> listUserSignCert(Integer userId, List<GigTypeEnum> gigTypeList) {
+		List<SysUserSub> userSubList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
+				.eq(SysUserSub::getUserId, userId)
+				.eq(SysUserSub::getGigType, gigTypeList));
+		return userSubList;
+	}
+
 	/**
 	 * 查询用户签约认证信息
 	 *
@@ -199,9 +214,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());
@@ -361,8 +376,8 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 	public void bindCardConfirm(UserSignCertDTO userSignCertDTO) {
 		List<SysUserSub> userSubList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
 				.eq(SysUserSub::getUserId, userSignCertDTO.getUserId())
-				.in(SysUserSub::getGigType, GigTypeEnum.TAX_HELPOR, GigTypeEnum.YEE));
-		if (CollUtil.isEmpty(userSubList) || userSubList.size() != 2) {
+				.in(SysUserSub::getGigType, userSignCertDTO.getGigTypeList()));
+		if (CollUtil.isEmpty(userSubList)) {
 			throw new RuntimeException("数据异常");
 		}
 		BaseMap gigInfo = new BaseMap();