✨ 新增司机档案登录自动建档与账号绑定接口

2026-10-23 15:48:57 +08:00
parent 3475ec1f87
commit 49be9c6d52
8 changed files with 402 additions and 5 deletions
@@ -0,0 +1,58 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.feign;
+
+import org.springblade.core.tool.api.R;
+import org.springblade.transport.pojo.dto.DriverEnsureProfileDTO;
+import org.springblade.transport.pojo.vo.DriverEnsureProfileVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 司机档案 Feign 接口
+ *
+ * @author Chill
+ */
+@FeignClient(value = "blade-transport")
+public interface IDriverClient {
+
+	String API_PREFIX = "/feign/client/driver";
+	String ENSURE_PROFILE = API_PREFIX + "/ensure-profile";
+
+	/**
+	 * 查找或创建司机档案，并把档案绑定到指定小程序账号
+	 * <p>
+	 * 幂等入口：按 user_id 命中时原样返回；冲突（同号多档案 / 已被其他账号占用）
+	 * 不新建、不覆盖，通过返回值的 message 说明原因，不抛异常给登录方。
+	 *
+	 * @param param 租户、小程序账号与手机号
+	 * @return 档案ID与本次处置标志
+	 */
+	@PostMapping(ENSURE_PROFILE)
+	R<DriverEnsureProfileVO> ensureProfile(@RequestBody DriverEnsureProfileDTO param);
+
+}
@@ -0,0 +1,55 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.pojo.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 司机档案「查找或创建并绑定账号」参数
+ *
+ * @author Chill
+ */
+@Data
+@Schema(description = "司机档案查找或创建参数")
+public class DriverEnsureProfileDTO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "租户ID，为空时取当前登录租户；仍为空则拒绝写库")
+	private String tenantId;
+
+	@Schema(description = "关联小程序用户ID（blade_mp_user.id）")
+	private Long mpUserId;
+
+	@Schema(description = "手机号，仅在按账号未命中时用于查找已有档案")
+	private String phone;
+
+}
@@ -40,6 +40,7 @@ import org.springblade.transport.jackson.FlexibleLocalDateDeserializer;

 import java.io.Serial;
 import java.time.LocalDate;
+import java.time.LocalDateTime;

 /**
 * 司机管理实体类
@@ -223,6 +224,17 @@ public class Driver extends TenantEntity {
 	@Schema(description = "关联小程序用户ID")
 	@JsonSerialize(using = ToStringSerializer.class)
 	private Long userId;
+	/**
+	 * 档案来源：login_auto（登录自动建）/ login_bound（绑到已有档案）/
+	 * admin（后台建）/ cert_backfill（存量订正）；NULL 表示来源未知
+	 */
+	@Schema(description = "档案来源")
+	private String profileSource;
+	/**
+	 * 档案与账号建立关联的时点
+	 */
+	@Schema(description = "账号绑定时间")
+	private LocalDateTime accountBoundTime;
 	/**
 	 * 与联系人关系
 	 */
@@ -0,0 +1,58 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.pojo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 司机档案「查找或创建并绑定账号」结果
+ *
+ * @author Chill
+ */
+@Data
+@Schema(description = "司机档案查找或创建结果")
+public class DriverEnsureProfileVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "命中的司机档案ID，冲突时为null")
+	private Long driverId;
+
+	@Schema(description = "本次新建了档案")
+	private Boolean created;
+
+	@Schema(description = "本次把已有档案绑定到了账号")
+	private Boolean boundExisting;
+
+	@Schema(description = "冲突原因；成功时为null")
+	private String message;
+
+}