feat: 阿拉丁认证回调修改

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

@@ -78,4 +78,20 @@ public class OladingCommonRequest implements Serializable {
 		 */
 		private String desc;
 	}
+
+	/**
+	 * 签约状态；包括已签约、未签约
+	 */
+	@Getter
+	@AllArgsConstructor
+	public enum CertStatus {
+
+		// 签约状态
+		UN_SIGN(0, "未签约"),
+		SIGN(1, "已签约");
+
+		private final Integer code;
+
+		private final String message;
+	}
 }

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

@@ -1,13 +1,10 @@
 package com.qunzhixinxi.hnqz.admin.controller;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
 import com.qunzhixinxi.hnqz.admin.api.dto.OladingCommonRequest;
 import com.qunzhixinxi.hnqz.admin.entity.OladingInputRecord;
-import com.qunzhixinxi.hnqz.admin.entity.model.OladingSignUpRequest;
 import com.qunzhixinxi.hnqz.admin.service.gig.GigThirdApiService;
 import com.qunzhixinxi.hnqz.admin.service.gig.OladingInputRecordService;
 import com.qunzhixinxi.hnqz.admin.util.HMACSignProvider;
@@ -72,10 +69,12 @@ public class GigThirdApiController {
 		OladingCommonRequest.Req req = JSONUtil.toBean(reqStr, OladingCommonRequest.Req.class);
 		// 请求接口名称
 		String interfaceName = req.getName();
+		// 请求data
+		Map<String, Object> data = req.getData();
 		// 请求requestId
-		String requestId = (String) req.getData().get("requestId");
+		String requestId = (String) data.get("requestId");
 		if (StrUtil.isBlank(requestId)) {
-			requestId = (String) req.getData().get("request_id");
+			requestId = (String) data.get("request_id");
 		}
 
 		String redisKey = String.format("%s_%s_%s", CacheConstants.OLADING_SIGN_UP_NOTIFY_KEY, interfaceName, requestId);
@@ -93,6 +92,7 @@ public class GigThirdApiController {
 
 		// 1.请求记录
 		OladingInputRecord record = new OladingInputRecord();
+		record.setRequestId(requestId);
 		record.setInterfaceName(interfaceName);
 		record.setReqBody(String.format("%s,%s", reqStr, sign));
 		record.setPrivateKey("");
@@ -111,13 +111,15 @@ public class GigThirdApiController {
 			switch (interfaceNameEnum) {
 				case SIGN_UP:
 					// 签约回调
-					Map<String, Object> data = req.getData();
-					OladingSignUpRequest signUpRequest =
-							BeanUtil.mapToBean(data, OladingSignUpRequest.class, true, CopyOptions.create());
-					gigThirdApiService.oladingSignUpNotify(signUpRequest);
+					String signUpStatus = (String) data.get("status");
+					OladingCommonRequest.CertStatus signUpCertStatus = Enum.valueOf(OladingCommonRequest.CertStatus.class, signUpStatus);
+					gigThirdApiService.oladingSignUpNotify(requestId, signUpCertStatus.getCode());
 					break;
 				case UPLOAD_ID_CARD_IMAGE:
 					// 证照上传回调 TODO
+					String updateStatus = (String) data.get("status");
+					OladingCommonRequest.CertStatus updateCertStatus = Enum.valueOf(OladingCommonRequest.CertStatus.class, updateStatus);
+					gigThirdApiService.oladingSignUpNotify(requestId, updateCertStatus.getCode());
 					break;
 				default:
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/OladingInputRecord.java

@@ -24,6 +24,11 @@ public class OladingInputRecord extends Model<OladingInputRecord> {
 	@TableId(type = IdType.AUTO)
 	private Integer id;
 
+	/**
+	 * 请求流水号
+	 */
+	private String requestId;
+
 	/**
 	 * 请求接口名称
 	 */

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/model/OladingSignUpRequest.java

@@ -1,48 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.entity.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.Getter;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-/**
- * 自由职家回调参数
- *
- * @author lixuesong
- * @date 2022年04月17日 11:38
- */
-@Data
-public class OladingSignUpRequest {
-
-	/**
-	 * 请求流水号，由商户保持唯一
-	 */
-	@NotBlank(message = "request_id必填")
-	@JsonProperty("request_id")
-	private String requestId;
-
-	/**
-	 * 签约状态；包括已签约、未签约
-	 */
-	@NotNull(message = "status必填")
-	private CertStatus status;
-
-	/**
-	 * 签约状态；包括已签约、未签约
-	 */
-	@Getter
-	@AllArgsConstructor
-	public enum CertStatus {
-
-		// 签约状态
-		UN_SIGN(0, "未签约"),
-		SIGN(1, "已签约");
-
-		private final Integer code;
-
-		private final String message;
-	}
-}

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

@@ -1,7 +1,5 @@
 package com.qunzhixinxi.hnqz.admin.service.gig;
 
-import com.qunzhixinxi.hnqz.admin.entity.model.OladingSignUpRequest;
-
 /**
  * 第三方零工接口处理
  *
@@ -13,7 +11,17 @@ public interface GigThirdApiService {
 	/**
 	 * 自由职家签约结果回调
 	 *
-	 * @param signUpRequest
+	 * @param requestId
+	 * @param certStatus
+	 */
+	void oladingSignUpNotify(String requestId, Integer certStatus);
+
+	/**
+	 * 自由职家证照上传结果回调
+	 *
+	 * @param requestId
+	 * @param certStatus
 	 */
-	void oladingSignUpNotify(OladingSignUpRequest signUpRequest);
+	void oladingUploadIdCardImageNotify(String requestId, Integer certStatus);
+
 }

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

@@ -2,10 +2,7 @@ package com.qunzhixinxi.hnqz.admin.service.gig.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
-import com.qunzhixinxi.hnqz.admin.entity.dto.UserSignCertDTO;
-import com.qunzhixinxi.hnqz.admin.entity.model.OladingSignUpRequest;
 import com.qunzhixinxi.hnqz.admin.enums.GigTypeEnum;
-import com.qunzhixinxi.hnqz.admin.enums.OladingCertStatus;
 import com.qunzhixinxi.hnqz.admin.service.SysUserSubService;
 import com.qunzhixinxi.hnqz.admin.service.gig.GigThirdApiService;
 import com.qunzhixinxi.hnqz.admin.service.gig.SysUserSignCertService;
@@ -15,8 +12,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Collections;
-
 /**
  * @author lixuesong
  * @date 2022年04月17日 11:55
@@ -33,13 +28,12 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 	/**
 	 * 自由职家签约结果回调
 	 *
-	 * @param signUpRequest
+	 * @param requestId
+	 * @param certStatus
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void oladingSignUpNotify(OladingSignUpRequest signUpRequest) {
-		String requestId = signUpRequest.getRequestId();
-		OladingSignUpRequest.CertStatus status = signUpRequest.getStatus();
+	public void oladingSignUpNotify(String requestId, Integer certStatus) {
 
 		// 先查询requestId是否存在
 		SysUserSub userSub = sysUserSubService.getOne(Wrappers.<SysUserSub>lambdaQuery()
@@ -51,7 +45,7 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 		// 更新状态
 		SysUserSub updateUserSub = new SysUserSub();
 		updateUserSub.setId(userSub.getId());
-		updateUserSub.setCertStatus(status.getCode());
+		updateUserSub.setCertStatus(certStatus);
 		sysUserSubService.updateById(updateUserSub);
 
 		// 如果成功，则发送证照上传MQ TODO
@@ -62,4 +56,15 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 //			sysUserSignCertService.batchChannelCert(userSignCertDTO);
 //		}
 	}
+
+	/**
+	 * 自由职家证照上传结果回调
+	 *
+	 * @param requestId
+	 * @param certStatus
+	 */
+	@Override
+	public void oladingUploadIdCardImageNotify(String requestId, Integer certStatus) {
+
+	}
 }