feat: 阿拉丁回调修改

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/OladingCommonRequest.java

@@ -68,7 +68,9 @@ public class OladingCommonRequest implements Serializable {
 	public enum InterfaceName {
 
 		// 接口名称
-		SIGN_UP("签约回调"), UPLOAD_ID_CARD_IMAGE("证照上传回调");
+		SIGN_UP("签约回调"),
+		UPLOAD_ID_CARD_IMAGE("证照上传回调"),
+		UPLOAD_TAXPAYER_AGREEMENT("上传企业纳税人协议回调");
 
 		/**
 		 * 描述

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

@@ -117,7 +117,7 @@ public class GigThirdApiController {
 						String signUpStatus = (String) data.get("status");
 						OladingCommonRequest.CertStatus signUpCertStatus = Enum.valueOf(OladingCommonRequest.CertStatus.class, signUpStatus);
 						if (OladingCommonRequest.CertStatus.SIGN.equals(signUpCertStatus)) {
-							gigThirdApiService.oladingSignUpNotify(requestIdPrefix, Integer.valueOf(OladingCertStatus.SIGNED.getCode()));
+							gigThirdApiService.oladingSignUp(requestIdPrefix, Integer.valueOf(OladingCertStatus.SIGNED.getCode()));
 						}
 						break;
 					case UPLOAD_ID_CARD_IMAGE:
@@ -133,9 +133,14 @@ public class GigThirdApiController {
 							certStatus = Integer.valueOf(OladingCertStatus.IDENTIFY_FAIL.getCode());
 						}
 						if (certStatus != null) {
-							gigThirdApiService.oladingUploadIdCardImageNotify(requestIdPrefix, certStatus);
+							gigThirdApiService.oladingUploadIdCardImage(requestIdPrefix, certStatus);
 						}
 						break;
+
+					case UPLOAD_TAXPAYER_AGREEMENT:
+						// 上传企业纳税人协议回调
+//							gigThirdApiService.
+						break;
 					default:
 
 				}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/OladingCertStatus.java

@@ -20,9 +20,12 @@ public enum OladingCertStatus {
 	// 签约状态
     UN_SIGNED("0", "未签约"),
     SIGNED("1", "已签约"),
-	SIGNING("2", "签约中"),
+	SIGNING("2", "签约中"), // TODO
 	IDENTIFY_SUCCESS("3", "已认证"),
-	IDENTIFY_FAIL("4", "认证失败");
+	IDENTIFY_FAIL("4", "认证失败"),
+	AGREEMENT_SUCCESS("5", "上传成功"),
+	AGREEMENT_FAIL("6", "上传失败"),
+	FINISH("7", "已完成");
 
     private final String code;
 

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

@@ -8,13 +8,21 @@ package com.qunzhixinxi.hnqz.admin.service.gig;
  */
 public interface GigThirdApiService {
 
+	/**
+	 * 自由职家回调业务处理
+	 *
+	 * @param requestId
+	 * @param certStatus
+	 */
+	void oladingNotify(String requestId, Integer certStatus);
+
 	/**
 	 * 自由职家签约结果回调
 	 *
 	 * @param requestId
 	 * @param certStatus
 	 */
-	void oladingSignUpNotify(String requestId, Integer certStatus);
+	void oladingSignUp(String requestId, Integer certStatus);
 
 	/**
 	 * 自由职家证照上传结果回调
@@ -22,6 +30,14 @@ public interface GigThirdApiService {
 	 * @param requestId
 	 * @param certStatus
 	 */
-	void oladingUploadIdCardImageNotify(String requestId, Integer certStatus);
+	void oladingUploadIdCardImage(String requestId, Integer certStatus);
+
+	/**
+	 * 自由职家上传企业纳税人协议回调
+	 *
+	 * @param requestId
+	 * @param certStatus
+	 */
+	void oladingUploadTaxpayerAgreement(String requestId, Integer certStatus);
 
 }

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

@@ -30,6 +30,17 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 
 	private final SysUserSignCertService sysUserSignCertService;
 
+	/**
+	 * 自由职家回调业务处理
+	 *
+	 * @param requestId
+	 * @param certStatus
+	 */
+	@Override
+	public void oladingNotify(String requestId, Integer certStatus) {
+		// TODO
+	}
+
 	/**
 	 * 自由职家签约结果回调
 	 *
@@ -38,7 +49,7 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void oladingSignUpNotify(String requestId, Integer certStatus) {
+	public void oladingSignUp(String requestId, Integer certStatus) {
 		// 先查询requestId是否存在
 		SysUserSub userSub = sysUserSubService.getOne(Wrappers.<SysUserSub>lambdaQuery()
 				.eq(SysUserSub::getGigType, GigTypeEnum.OLADING)
@@ -52,8 +63,8 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 		updateUserSub.setCertStatus(certStatus);
 		sysUserSubService.updateById(updateUserSub);
 
-		// 如果成功，则发送证照上传MQ TODO
-		if (OladingCertStatus.SIGNED.getCode().equals(certStatus)) {
+		// 如果成功，则发送证照上传MQ
+		if (OladingCertStatus.SIGNED.getCode().equals(String.valueOf(certStatus))) {
 			UserSignCertDTO userSignCertDTO = new UserSignCertDTO();
 			userSignCertDTO.setUserId(userSub.getUserId());
 			userSignCertDTO.setGigTypeList(Collections.singletonList(GigTypeEnum.OLADING));
@@ -68,7 +79,32 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 	 * @param certStatus
 	 */
 	@Override
-	public void oladingUploadIdCardImageNotify(String requestId, Integer certStatus) {
+	public void oladingUploadIdCardImage(String requestId, Integer certStatus) {
+		// 先查询requestId是否存在
+		SysUserSub userSub = sysUserSubService.getOne(Wrappers.<SysUserSub>lambdaQuery()
+				.eq(SysUserSub::getGigType, GigTypeEnum.OLADING)
+				.eq(SysUserSub::getRequestId, requestId));
+		if (userSub == null) {
+			throw new ValidateCodeException("requestId不存在");
+		}
+		// 更新状态
+		SysUserSub updateUserSub = new SysUserSub();
+		updateUserSub.setId(userSub.getId());
+		updateUserSub.setCertStatus(certStatus);
+		if (OladingCertStatus.FINISH.getCode().equals(String.valueOf(certStatus))) {
+			updateUserSub.setCallbackStatus(GigCallBackStatus.RETURNED);
+		}
+		sysUserSubService.updateById(updateUserSub);
+	}
+
+	/**
+	 * 自由职家上传企业纳税人协议回调
+	 *
+	 * @param requestId
+	 * @param certStatus
+	 */
+	@Override
+	public void oladingUploadTaxpayerAgreement(String requestId, Integer certStatus) {
 		// 先查询requestId是否存在
 		SysUserSub userSub = sysUserSubService.getOne(Wrappers.<SysUserSub>lambdaQuery()
 				.eq(SysUserSub::getGigType, GigTypeEnum.OLADING)
@@ -80,7 +116,9 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 		SysUserSub updateUserSub = new SysUserSub();
 		updateUserSub.setId(userSub.getId());
 		updateUserSub.setCertStatus(certStatus);
-		updateUserSub.setCallbackStatus(GigCallBackStatus.RETURNED);
+		if (OladingCertStatus.FINISH.getCode().equals(String.valueOf(certStatus))) {
+			updateUserSub.setCallbackStatus(GigCallBackStatus.RETURNED);
+		}
 		sysUserSubService.updateById(updateUserSub);
 	}
 }