Merge branch 'feat-20220615-yeejinyuan' into temp-pre

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

@@ -81,7 +81,7 @@ public class OladingCommonRequest implements Serializable {
 	}
 
 	/**
-	 * 签约状态；包括已签约、未签约
+	 * 签约状态；包括已签约、未签约、签约中
 	 */
 	@Getter
 	@AllArgsConstructor
@@ -89,7 +89,8 @@ public class OladingCommonRequest implements Serializable {
 
 		// 签约状态
 		UN_SIGN(0, "未签约"),
-		SIGN(1, "已签约");
+		SIGN(1, "已签约"),
+		SIGNING(2, "签约中");
 
 		private final Integer code;
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mq/GigSignCertReceiver.java

@@ -374,6 +374,14 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 			updateUser.setUpdateTime(now);
 			sysUserService.updateById(updateUser);
 		}
+		// 如果是签约中，则判断'阿拉丁签约方法'状态
+		if (OladingCommonRequest.SignUpStatus.SIGNING.name().equals(certStatus)) {
+			JSONObject stageResult = subjectResult.getJSONObject("stageResult");
+			JSONObject oladingSignUpResult = stageResult.getJSONObject("阿拉丁签约方法");
+			if (oladingSignUpResult == null || !StrUtil.equals("0", oladingSignUpResult.getStr("code"))) {
+				updateWrapper.set(SysUserSub::getCallbackStatus, GigCallBackStatus.RETURNED);
+			}
+		}
 		// 已认证，则设置回调状态
 		if (OladingCertStatus.CERT.getCode().equals(String.valueOf(userSub.getCertStatus()))) {
 			updateWrapper.set(SysUserSub::getCallbackStatus, GigCallBackStatus.RETURNED);