Merge branch 'master' of http://192.168.1.25:3000/lbyzx123/huimv-employment

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/draft/DraftService.java

@@ -558,15 +558,17 @@ public class DraftService {
         response.setEstimatedTotal(draft.getEstimatedTotal());
         response.setEstimatedPerCapita(draft.getEstimatedPerCapita());
         response.setSelectedPlanId(draft.getSelectedPlanId());
-        response.setQrCodeUrl(findQrCodeUrlByDraftId(draft.getId()));
+        FeRegistrationBatch batch = findRegistrationBatchByDraftId(draft.getId());
+        response.setQrCodeUrl(batch != null ? batch.getQrCodeUrl() : null);
+        response.setQrToken(batch != null ? batch.getQrToken() : null);
         response.setFields(fields.stream().map(this::toFieldResponse).collect(Collectors.toList()));
         response.setCreateTime(draft.getCreateTime());
         response.setUpdateTime(draft.getUpdateTime());
         return response;
     }
 
-    /** 草稿确认后关联订单 → 登记批次上的小程序码；未确认则为 null。 */
-    private String findQrCodeUrlByDraftId(Long draftId) {
+    /** 草稿确认后关联订单 → 登记批次；未确认则为 null。 */
+    private FeRegistrationBatch findRegistrationBatchByDraftId(Long draftId) {
         if (draftId == null) {
             return null;
         }
@@ -577,11 +579,10 @@ public class DraftService {
         if (order == null) {
             return null;
         }
-        FeRegistrationBatch batch = feRegistrationBatchMapper.selectOne(new LambdaQueryWrapper<FeRegistrationBatch>()
+        return feRegistrationBatchMapper.selectOne(new LambdaQueryWrapper<FeRegistrationBatch>()
                 .eq(FeRegistrationBatch::getOrderId, order.getId())
                 .orderByDesc(FeRegistrationBatch::getId)
                 .last("LIMIT 1"));
-        return batch != null ? batch.getQrCodeUrl() : null;
     }
 
     private DraftFieldResponse toFieldResponse(FeDraftField entity) {

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/draft/McpDraftService.java

@@ -213,8 +213,6 @@ public class McpDraftService {
         response.setStatus(SUBMIT_SUCCESS);
         response.setOrderId(order.getOrderNo());
         response.setBatchId(batch.getBatchNo());
-        response.setRegistrationUrl(batch.getRegistrationUrl());
-        response.setQrCodeUrl(batch.getQrCodeUrl());
         return response;
     }
 
@@ -501,6 +499,7 @@ public class McpDraftService {
     private McpDraftGenerateResponse toGenerateResponse(FeEmploymentDraft draft) {
         List<String> missing = parseMissingFields(draft.getMissingFields());
         McpDraftGenerateResponse response = new McpDraftGenerateResponse();
+        response.setDraftId(draft.getId());
         response.setSchema(DraftSchemaRegistry.buildSchema());
         response.setMissingFields(missing);
         response.setStatus(missing.isEmpty() ? MCP_STATUS_READY : MCP_STATUS_INCOMPLETE);

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/draft/dto/DraftDetailResponse.java

@@ -99,11 +99,12 @@ public class DraftDetailResponse {
     @Schema(description = "已选方案 ID")
     private Long selectedPlanId;
 
-    @JsonProperty("qr_code_url")
-    @JsonInclude(JsonInclude.Include.ALWAYS)
     @Schema(description = "登记小程序码图片 URL（确认方案后由 fe_registration_batch 带回；未确认时为 null）")
     private String qrCodeUrl;
 
+    @Schema(description = "登记扫码 token（fe_registration_batch.qr_token，与小程序码 scene 一致；未确认时为 null）")
+    private String qrToken;
+
     @Schema(description = "字段级明细（来源、可编辑性）")
     private List<DraftFieldResponse> fields;
 
@@ -345,6 +346,14 @@ public class DraftDetailResponse {
         this.qrCodeUrl = qrCodeUrl;
     }
 
+    public String getQrToken() {
+        return qrToken;
+    }
+
+    public void setQrToken(String qrToken) {
+        this.qrToken = qrToken;
+    }
+
     public List<DraftFieldResponse> getFields() {
         return fields;
     }

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/draft/dto/McpDraftGenerateResponse.java

@@ -7,6 +7,9 @@ import java.util.List;
 @Schema(description = "MCP 生成初始草稿响应")
 public class McpDraftGenerateResponse {
 
+    @Schema(description = "草稿 ID")
+    private Long draftId;
+
     @Schema(description = "草稿 Schema")
     private McpDraftSchema schema;
 
@@ -16,6 +19,14 @@ public class McpDraftGenerateResponse {
     @Schema(description = "待补充字段")
     private List<String> missingFields;
 
+    public Long getDraftId() {
+        return draftId;
+    }
+
+    public void setDraftId(Long draftId) {
+        this.draftId = draftId;
+    }
+
     public McpDraftSchema getSchema() {
         return schema;
     }