feat: 认证修改

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

@@ -42,7 +42,7 @@ public class GigThirdApiController {
 	private static final HMACSignProvider hMACSignProvide = new HMACSignProvider();
 
 	/**
-	 * 公钥
+	 * 公钥 TODO 暂时没有
 	 */
 	private static final String PUBLIC_KEY = "123123123";
 
@@ -75,14 +75,14 @@ public class GigThirdApiController {
 		record.setInterfaceName(interfaceName);
 		record.setReqBody(JSONUtil.toJsonStr(oladingRequest));
 		record.setPrivateKey("");
-		record.setPublicKey(PUBLIC_KEY);
+		record.setPublicKey("");
 		oladingInputRecordService.save(record);
 
 		try {
-			// 2. 验签
-			boolean verfyResult =
-					hMACSignProvide.verfy(ALGORITHM_TYPE, PUBLIC_KEY, JSONUtil.toJsonStr(req.getData()), sign);
-			log.info("验签结果: {}", verfyResult);
+			// 2. 验签 TODO 暂不验签
+//			boolean verfyResult =
+//					hMACSignProvide.verfy(ALGORITHM_TYPE, PUBLIC_KEY, JSONUtil.toJsonStr(req.getData()), sign);
+//			log.info("验签结果: {}", verfyResult);
 
 			// 3.实际操作
 

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

@@ -309,12 +309,14 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 		}
 		// 查询dept
 		SysDept dept = sysDeptService.getById(sysUser.getDeptId());
+		// 查询当前用户关联的userSub
 		LambdaQueryWrapper<SysUserSub> userSubWrapper = Wrappers.lambdaQuery();
 		userSubWrapper.eq(SysUserSub::getUserId, userId);
 		if (CollUtil.isNotEmpty(userSignCertDTO.getGigTypeList())) {
 			userSubWrapper.in(SysUserSub::getGigType, userSignCertDTO.getGigTypeList());
 		}
 		List<SysUserSub> userSubList = sysUserSubService.list(userSubWrapper);
+
 		if (CollUtil.isNotEmpty(userSubList)) {
 			// 封装请求数据
 			userSubList.stream().filter(sysUserSub -> {
@@ -337,53 +339,14 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 			}).forEach(userSub -> {
 				// 请求流水号
 				String requestId = IdUtil.fastSimpleUUID();
-				// 基础信息
-				GigBaseInfoModel baseInfoModel = new GigBaseInfoModel();
-				baseInfoModel.setRequestId(requestId);
-				baseInfoModel.setGigType(userSub.getGigType());
-				baseInfoModel.setGigChannel(userSub.getGigChannel());
-				// 用户信息
-				GigUserInfoModel userInfoModel = new GigUserInfoModel();
-				userInfoModel.setUserId(userId);
-				userInfoModel.setName(sysUser.getRealname());
-				userInfoModel.setUsername(sysUser.getUsername());
-				userInfoModel.setEntCode(dept.getTaxCode());
-				userInfoModel.setDeptId(sysUser.getDeptId());
-				userInfoModel.setIdCard(sysUser.getIdCardNumber());
-				userInfoModel.setIdCardType(MemberIDCardType.ID_CARD);
-				userInfoModel.setMemberType(MemberType.YAOYI_EXCLUSIVE_PERSONNEL);
-				userInfoModel.setEmail("gig_service@yaoyi.net"); // TODO
-				userInfoModel.setAddress("北京市-房山区-长阳镇");
-				userInfoModel.setPayChannel(PayChannel.BANK_CARD);
-				userInfoModel.setBankPhone(userSub.getBankPhone());
-				userInfoModel.setBankCard(userSub.getBankCardNumber());
-				userInfoModel.setIdCardFront(StrUtil.isBlank(userSub.getIdCardFrontUrl())
-						? null : userSub.getIdCardFrontUrl().startsWith("https")
-						? userSub.getIdCardFrontUrl() : upmsConfig.getClientUrl() + userSub.getIdCardFrontUrl());
-				userInfoModel.setIdCardBack(StrUtil.isBlank(userSub.getIdCardBackUrl())
-						? null : userSub.getIdCardBackUrl().startsWith("https")
-						? userSub.getIdCardBackUrl() : upmsConfig.getClientUrl() + userSub.getIdCardBackUrl());
-				userInfoModel.setCertVideo1(StrUtil.isBlank(userSub.getCertVideo1Url())
-						? null : userSub.getCertVideo1Url().startsWith("https")
-						? userSub.getCertVideo1Url() : upmsConfig.getClientUrl() + userSub.getCertVideo1Url());
-				userInfoModel.setCertVideo2(StrUtil.isBlank(userSub.getCertVideo2Url())
-						? null : userSub.getCertVideo2Url().startsWith("https")
-						? userSub.getCertVideo2Url() : upmsConfig.getClientUrl() + userSub.getCertVideo2Url());
-				userInfoModel.setSignImageUrl(StrUtil.isBlank(userSub.getAgreementUrl())
-						? null : userSub.getAgreementUrl().startsWith("https")
-						? userSub.getAgreementUrl() : upmsConfig.getClientUrl() + userSub.getAgreementUrl());
-
-				GigInfoModel infoModel = new GigInfoModel();
-				infoModel.setBaseInfo(baseInfoModel);
-				infoModel.setUserInfo(userInfoModel);
-
+				// 封装请求参数
+				GigInfoModel infoModel = buildChannelCertModel(sysUser, userSub, dept.getTaxCode(), requestId);
 				// 更新为进行中状态
 				SysUserSub updateUserSub = new SysUserSub();
 				updateUserSub.setId(userSub.getId());
 				updateUserSub.setRequestId(requestId);
 				updateUserSub.setCallbackStatus(GigCallBackStatus.IN_PROGRESS);
 				sysUserSubService.updateById(updateUserSub);
-
 				// 发送mq
 				BaseMap gigInfo = new BaseMap();
 				gigInfo.put(userSub.getGigType().name(), infoModel);
@@ -395,6 +358,59 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 		return false;
 	}
 
+	/**
+	 * 封装签约认证的请求参数
+	 *
+	 * @param sysUser
+	 * @param userSub
+	 * @param entCode
+	 * @param requestId
+	 * @return
+	 */
+	private GigInfoModel buildChannelCertModel(SysUser sysUser, SysUserSub userSub, String entCode, String requestId) {
+		// 基础信息
+		GigBaseInfoModel baseInfoModel = new GigBaseInfoModel();
+		baseInfoModel.setRequestId(requestId);
+		baseInfoModel.setGigType(userSub.getGigType());
+		baseInfoModel.setGigChannel(userSub.getGigChannel());
+		// 用户信息
+		GigUserInfoModel userInfoModel = new GigUserInfoModel();
+		userInfoModel.setUserId(sysUser.getUserId());
+		userInfoModel.setName(sysUser.getRealname());
+		userInfoModel.setUsername(sysUser.getUsername());
+		userInfoModel.setEntCode(entCode);
+		userInfoModel.setDeptId(sysUser.getDeptId());
+		userInfoModel.setIdCard(sysUser.getIdCardNumber());
+		userInfoModel.setIdCardType(MemberIDCardType.ID_CARD);
+		userInfoModel.setMemberType(MemberType.YAOYI_EXCLUSIVE_PERSONNEL);
+		userInfoModel.setEmail("gig_service@yaoyi.net"); // TODO
+		userInfoModel.setAddress("北京市-房山区-长阳镇");
+		userInfoModel.setPayChannel(PayChannel.BANK_CARD);
+		userInfoModel.setBankPhone(userSub.getBankPhone());
+		userInfoModel.setBankCard(userSub.getBankCardNumber());
+		userInfoModel.setIdCardFront(StrUtil.isBlank(userSub.getIdCardFrontUrl())
+				? null : userSub.getIdCardFrontUrl().startsWith("https")
+				? userSub.getIdCardFrontUrl() : upmsConfig.getClientUrl() + userSub.getIdCardFrontUrl());
+		userInfoModel.setIdCardBack(StrUtil.isBlank(userSub.getIdCardBackUrl())
+				? null : userSub.getIdCardBackUrl().startsWith("https")
+				? userSub.getIdCardBackUrl() : upmsConfig.getClientUrl() + userSub.getIdCardBackUrl());
+		userInfoModel.setCertVideo1(StrUtil.isBlank(userSub.getCertVideo1Url())
+				? null : userSub.getCertVideo1Url().startsWith("https")
+				? userSub.getCertVideo1Url() : upmsConfig.getClientUrl() + userSub.getCertVideo1Url());
+		userInfoModel.setCertVideo2(StrUtil.isBlank(userSub.getCertVideo2Url())
+				? null : userSub.getCertVideo2Url().startsWith("https")
+				? userSub.getCertVideo2Url() : upmsConfig.getClientUrl() + userSub.getCertVideo2Url());
+		userInfoModel.setSignImageUrl(StrUtil.isBlank(userSub.getAgreementUrl())
+				? null : userSub.getAgreementUrl().startsWith("https")
+				? userSub.getAgreementUrl() : upmsConfig.getClientUrl() + userSub.getAgreementUrl());
+
+		GigInfoModel infoModel = new GigInfoModel();
+		infoModel.setBaseInfo(baseInfoModel);
+		infoModel.setUserInfo(userInfoModel);
+
+		return infoModel;
+	}
+
 	/**
 	 * 税邦云发送绑卡验证码
 	 *