feat: 阿拉丁认证回调修改

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

@@ -71,7 +71,7 @@ public class OladingCommonRequest implements Serializable {
 	public enum InterfaceName {
 
 		// 接口名称
-		SIGN_UP_NOTIFY("签约回调"), UPLOAD_ID_CARD_IMAGE("证照上传回调");
+		SIGN_UP("签约回调"), UPLOAD_ID_CARD_IMAGE("证照上传回调");
 
 		/**
 		 * 描述

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

@@ -5,7 +5,7 @@ import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.json.JSONUtil;
 import com.qunzhixinxi.hnqz.admin.api.dto.OladingCommonRequest;
 import com.qunzhixinxi.hnqz.admin.entity.OladingInputRecord;
-import com.qunzhixinxi.hnqz.admin.entity.model.GigOladingSignUpRequest;
+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;
@@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
 import java.util.Map;
 
 /**
@@ -88,11 +87,11 @@ public class GigThirdApiController {
 
 			OladingCommonRequest.InterfaceName interfaceNameEnum = Enum.valueOf(OladingCommonRequest.InterfaceName.class, interfaceName);
 			switch (interfaceNameEnum) {
-				case SIGN_UP_NOTIFY:
+				case SIGN_UP:
 					// 签约回调
 					Map<String, Object> data = req.getData();
-					GigOladingSignUpRequest signUpRequest =
-							BeanUtil.mapToBean(data, GigOladingSignUpRequest.class, true, CopyOptions.create());
+					OladingSignUpRequest signUpRequest =
+							BeanUtil.mapToBean(data, OladingSignUpRequest.class, true, CopyOptions.create());
 					gigThirdApiService.oladingSignUpNotify(signUpRequest);
 					break;
 				case UPLOAD_ID_CARD_IMAGE:

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

@@ -1,5 +1,6 @@
 package com.qunzhixinxi.hnqz.admin.entity.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Getter;
@@ -14,12 +15,13 @@ import javax.validation.constraints.NotNull;
  * @date 2022年04月17日 11:38
  */
 @Data
-public class GigOladingSignUpRequest {
+public class OladingSignUpRequest {
 
 	/**
 	 * 请求流水号，由商户保持唯一
 	 */
 	@NotBlank(message = "request_id必填")
+	@JsonProperty("request_id")
 	private String requestId;
 
 	/**
@@ -35,8 +37,9 @@ public class GigOladingSignUpRequest {
 	@AllArgsConstructor
 	public enum CertStatus {
 
-		UN_SIGNED(0, "未签约"),
-		SIGNED(1, "已签约");
+		// 签约状态
+		UN_SIGN(0, "未签约"),
+		SIGN(1, "已签约");
 
 		private final Integer code;
 

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

@@ -1,6 +1,6 @@
 package com.qunzhixinxi.hnqz.admin.service.gig;
 
-import com.qunzhixinxi.hnqz.admin.entity.model.GigOladingSignUpRequest;
+import com.qunzhixinxi.hnqz.admin.entity.model.OladingSignUpRequest;
 
 /**
  * 第三方零工接口处理
@@ -15,5 +15,5 @@ public interface GigThirdApiService {
 	 *
 	 * @param signUpRequest
 	 */
-	void oladingSignUpNotify(GigOladingSignUpRequest signUpRequest);
+	void oladingSignUpNotify(OladingSignUpRequest signUpRequest);
 }

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
 import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
 import com.qunzhixinxi.hnqz.admin.entity.dto.UserSignCertDTO;
-import com.qunzhixinxi.hnqz.admin.entity.model.GigOladingSignUpRequest;
+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;
@@ -42,9 +42,9 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void oladingSignUpNotify(GigOladingSignUpRequest signUpRequest) {
+	public void oladingSignUpNotify(OladingSignUpRequest signUpRequest) {
 		String requestId = signUpRequest.getRequestId();
-		GigOladingSignUpRequest.CertStatus status = signUpRequest.getStatus();
+		OladingSignUpRequest.CertStatus status = signUpRequest.getStatus();
 		String redisKey = CacheConstants.OLADING_SIGN_UP_NOTIFY_KEY + requestId;
 		Boolean absent = redisTemplate.opsForValue().setIfAbsent(redisKey, status.getCode(), 10, TimeUnit.SECONDS);
 		if (!absent) {