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

huimv-employment/fe-api/src/main/java/com/huimv/employment/controller/mp/ConversationController.java

@@ -174,7 +174,8 @@ public class ConversationController {
             description = "需先 POST /conversations 创建会话。请求体仅需 message 字段；"
                     + "服务端组装上游 console/chat 请求，流式开始前写入 user 消息；"
                     + "SSE 最后一条消息由服务端注入 content_type/next_action/card_payload"
-                    + "（会话有 pending 草稿且 missingFields 为空时，不依赖智能体），"
+                    + "（有 confirmed 订单且登记批次 qr_code_url 非空时注入 card_order；"
+                    + "否则会话有 pending 草稿且 missingFields 为空时注入 card_draft，均不依赖智能体），"
                     + "并同步落库。可选请求头 X-Agent-Id。")
     public void chat(@PathVariable("id") Long conversationId,
                      @Validated @RequestBody ConversationChatRequest request,

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/conversation/ConversationChatService.java

@@ -20,7 +20,8 @@ import java.io.IOException;
 import java.io.OutputStream;
 
 /**
- * 会话内 AI 对话：流式转发；pending 且 missingFields 为空时在 SSE 最后一条消息注入卡片字段后落库。
+ * 会话内 AI 对话：流式转发；满足条件时在 SSE 最后一条消息注入卡片字段后落库。
+ * <p>订单码卡片优先于草稿卡片（均不依赖智能体）。</p>
  */
 @Service
 public class ConversationChatService {
@@ -101,7 +102,7 @@ public class ConversationChatService {
         ObjectNode msg = buildEnrichedLastMessage(heldTerminalLine, parsed);
         String json = objectMapper.writeValueAsString(msg);
         SseStreamSupport.writeDataEvent(output, json);
-        log.info("SSE 最后消息已写出 next_action={} content_type={} draftId={}",
+        log.info("SSE 最后消息已写出 next_action={} content_type={} relatedDraftId={}",
                 msg.path("next_action").asText(),
                 msg.path("content_type").asText(),
                 parsed.getRelatedDraftId());
@@ -135,8 +136,8 @@ public class ConversationChatService {
         }
 
         // 强制覆盖/追加卡片字段（不用智能体返回）
-        msg.put("content_type", MessageCardConstants.CONTENT_TYPE_CARD_DRAFT);
-        msg.put("next_action", MessageCardConstants.NEXT_ACTION_SHOW_EMPLOYMENT_DRAFT);
+        msg.put("content_type", parsed.getContentType());
+        msg.put("next_action", parsed.getNextAction());
         if (parsed.getRelatedDraftId() != null) {
             msg.put("related_draft_id", parsed.getRelatedDraftId());
         }

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/conversation/ConversationDraftCardEnricher.java

@@ -4,13 +4,18 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.huimv.employment.dao.entity.FeEmploymentDraft;
+import com.huimv.employment.dao.entity.FeEmploymentOrder;
+import com.huimv.employment.dao.entity.FeRegistrationBatch;
 import com.huimv.employment.dao.mapper.FeEmploymentDraftMapper;
+import com.huimv.employment.dao.mapper.FeEmploymentOrderMapper;
+import com.huimv.employment.dao.mapper.FeRegistrationBatchMapper;
 import com.huimv.employment.service.conversation.dto.ParsedAssistantReply;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -18,7 +23,12 @@ import java.util.Map;
 import java.util.regex.Pattern;
 
 /**
- * SSE 最后消息时，由服务端根据会话 pending 且 missingFields 为空的草稿注入卡片字段（不依赖智能体）。
+ * SSE 最后消息时，由服务端注入卡片字段（不依赖智能体）。
+ * <p>
+ * 优先级：
+ * 1）会话有 confirmed 订单且对应登记批次 {@code qr_code_url} 非空 → {@code card_order} / {@code show_order_qrcode}；
+ * 2）否则会话有 pending 且 missingFields 为空的草稿 → {@code card_draft} / {@code show_employment_draft}。
+ * </p>
  */
 @Component
 public class ConversationDraftCardEnricher {
@@ -26,22 +36,29 @@ public class ConversationDraftCardEnricher {
     private static final Logger log = LoggerFactory.getLogger(ConversationDraftCardEnricher.class);
 
     private static final String DB_STATUS_PENDING = "pending";
+    private static final String ORDER_STATUS_CONFIRMED = "confirmed";
 
     private static final Pattern FENCED_CARD_BLOCK = Pattern.compile(
             "```(?:fe-card|json)?\\s*[\\s\\S]*?```",
             Pattern.CASE_INSENSITIVE);
 
     private final FeEmploymentDraftMapper feEmploymentDraftMapper;
+    private final FeEmploymentOrderMapper feEmploymentOrderMapper;
+    private final FeRegistrationBatchMapper feRegistrationBatchMapper;
     private final ObjectMapper objectMapper;
 
     public ConversationDraftCardEnricher(FeEmploymentDraftMapper feEmploymentDraftMapper,
+                                         FeEmploymentOrderMapper feEmploymentOrderMapper,
+                                         FeRegistrationBatchMapper feRegistrationBatchMapper,
                                          ObjectMapper objectMapper) {
         this.feEmploymentDraftMapper = feEmploymentDraftMapper;
+        this.feEmploymentOrderMapper = feEmploymentOrderMapper;
+        this.feRegistrationBatchMapper = feRegistrationBatchMapper;
         this.objectMapper = objectMapper;
     }
 
     /**
-     * 会话有 pending 草稿且 missingFields 为空时追加 card_draft。
+     * 按会话状态追加订单码卡片或草稿卡片。
      */
     public ParsedAssistantReply attachCardOnComplete(Long conversationId, String assistantText) {
         String displayText = sanitizeDisplayText(assistantText);
@@ -50,21 +67,52 @@ public class ConversationDraftCardEnricher {
             log.warn("SSE 注入卡片跳过：conversationId 为空");
             return parsed;
         }
+
+        ParsedAssistantReply withOrder = tryAttachOrderCard(conversationId, parsed);
+        if (withOrder.hasCard()) {
+            return withOrder;
+        }
+        return tryAttachDraftCard(conversationId, parsed);
+    }
+
+    private ParsedAssistantReply tryAttachOrderCard(Long conversationId, ParsedAssistantReply parsed) {
+        ConfirmedOrderWithQr found = findLatestConfirmedOrderWithQr(conversationId);
+        if (found == null) {
+            log.info("SSE 注入订单卡片跳过：会话 {} 无 confirmed 订单或批次 qr_code_url 为空", conversationId);
+            return parsed;
+        }
+        try {
+            Map<String, Object> payload = buildOrderCardPayload(found.order, found.batch);
+            String cardPayload = objectMapper.writeValueAsString(payload);
+            log.info("SSE 注入订单卡片 conversationId={} orderNo={} batchId={} qr={}",
+                    conversationId, found.order.getOrderNo(), found.batch.getId(), found.batch.getQrCodeUrl());
+            return parsed.withCard(
+                    MessageCardConstants.CONTENT_TYPE_CARD_ORDER,
+                    MessageCardConstants.NEXT_ACTION_SHOW_ORDER_QRCODE,
+                    cardPayload,
+                    found.order.getDraftId());
+        } catch (Exception ex) {
+            log.warn("会话 {} 订单卡片注入失败: {}", conversationId, ex.getMessage(), ex);
+            return parsed;
+        }
+    }
+
+    private ParsedAssistantReply tryAttachDraftCard(Long conversationId, ParsedAssistantReply parsed) {
         FeEmploymentDraft draft = findPendingDraft(conversationId);
         if (draft == null) {
-            log.info("SSE 注入卡片跳过：会话 {} 无 pending 草稿", conversationId);
+            log.info("SSE 注入草稿卡片跳过：会话 {} 无 pending 草稿", conversationId);
             return parsed;
         }
         List<String> missing = parseMissingFields(draft.getMissingFields());
         if (!missing.isEmpty()) {
-            log.info("SSE 注入卡片跳过：会话 {} 草稿 {} missingFields 非空 {}",
+            log.info("SSE 注入草稿卡片跳过：会话 {} 草稿 {} missingFields 非空 {}",
                     conversationId, draft.getId(), missing);
             return parsed;
         }
         try {
             Map<String, Object> payload = buildDraftCardPayload(draft);
             String cardPayload = objectMapper.writeValueAsString(payload);
-            log.info("SSE 注入卡片 conversationId={} draftId={}", conversationId, draft.getId());
+            log.info("SSE 注入草稿卡片 conversationId={} draftId={}", conversationId, draft.getId());
             return parsed.withCard(
                     MessageCardConstants.CONTENT_TYPE_CARD_DRAFT,
                     MessageCardConstants.NEXT_ACTION_SHOW_EMPLOYMENT_DRAFT,
@@ -76,6 +124,46 @@ public class ConversationDraftCardEnricher {
         }
     }
 
+    private ConfirmedOrderWithQr findLatestConfirmedOrderWithQr(Long conversationId) {
+        List<FeEmploymentDraft> drafts = feEmploymentDraftMapper.selectList(
+                new LambdaQueryWrapper<FeEmploymentDraft>()
+                        .eq(FeEmploymentDraft::getConversationId, conversationId)
+                        .orderByDesc(FeEmploymentDraft::getId));
+        if (drafts == null || drafts.isEmpty()) {
+            return null;
+        }
+        List<Long> draftIds = new ArrayList<>(drafts.size());
+        for (FeEmploymentDraft draft : drafts) {
+            if (draft.getId() != null) {
+                draftIds.add(draft.getId());
+            }
+        }
+        if (draftIds.isEmpty()) {
+            return null;
+        }
+        List<FeEmploymentOrder> orders = feEmploymentOrderMapper.selectList(
+                new LambdaQueryWrapper<FeEmploymentOrder>()
+                        .in(FeEmploymentOrder::getDraftId, draftIds)
+                        .eq(FeEmploymentOrder::getOrderStatus, ORDER_STATUS_CONFIRMED)
+                        .orderByDesc(FeEmploymentOrder::getId));
+        if (orders == null || orders.isEmpty()) {
+            return null;
+        }
+        for (FeEmploymentOrder order : orders) {
+            FeRegistrationBatch batch = feRegistrationBatchMapper.selectOne(
+                    new LambdaQueryWrapper<FeRegistrationBatch>()
+                            .eq(FeRegistrationBatch::getOrderId, order.getId())
+                            .isNotNull(FeRegistrationBatch::getQrCodeUrl)
+                            .ne(FeRegistrationBatch::getQrCodeUrl, "")
+                            .orderByDesc(FeRegistrationBatch::getId)
+                            .last("LIMIT 1"));
+            if (batch != null && StringUtils.hasText(batch.getQrCodeUrl())) {
+                return new ConfirmedOrderWithQr(order, batch);
+            }
+        }
+        return null;
+    }
+
     private String sanitizeDisplayText(String raw) {
         if (!StringUtils.hasText(raw)) {
             return "";
@@ -102,7 +190,6 @@ public class ConversationDraftCardEnricher {
             return parsed != null ? parsed : Collections.emptyList();
         } catch (Exception ex) {
             log.warn("解析 missing_fields 失败，视为非空，跳过注入: {}", ex.getMessage());
-            // 解析失败时保守处理：不注入，避免误推未就绪草稿
             return Collections.singletonList("_parse_error");
         }
     }
@@ -122,4 +209,39 @@ public class ConversationDraftCardEnricher {
         payload.put("missing_fields", Collections.emptyList());
         return payload;
     }
+
+    private Map<String, Object> buildOrderCardPayload(FeEmploymentOrder order, FeRegistrationBatch batch) {
+        Map<String, Object> payload = new LinkedHashMap<>();
+        payload.put("draft_id", order.getDraftId());
+        payload.put("order_id", order.getId());
+        payload.put("order_no", order.getOrderNo());
+        payload.put("title", order.getTitle());
+        payload.put("worker_count", order.getWorkerCount());
+        payload.put("work_days", order.getWorkDays());
+        payload.put("work_type", order.getWorkType());
+        payload.put("work_location", order.getWorkLocation());
+        payload.put("work_start_date", order.getWorkStartDate());
+        payload.put("work_end_date", order.getWorkEndDate());
+        payload.put("order_status", order.getOrderStatus());
+        payload.put("current_step_code", order.getCurrentStepCode());
+        payload.put("registered_count", order.getRegisteredCount());
+        payload.put("pending_count", order.getPendingCount());
+        payload.put("total_outflow", order.getTotalOutflow());
+        payload.put("batch_id", batch.getId());
+        payload.put("batch_no", batch.getBatchNo());
+        payload.put("qr_code_url", batch.getQrCodeUrl());
+        payload.put("registration_url", batch.getRegistrationUrl());
+        payload.put("qr_token", batch.getQrToken());
+        return payload;
+    }
+
+    private static final class ConfirmedOrderWithQr {
+        private final FeEmploymentOrder order;
+        private final FeRegistrationBatch batch;
+
+        private ConfirmedOrderWithQr(FeEmploymentOrder order, FeRegistrationBatch batch) {
+            this.order = order;
+            this.batch = batch;
+        }
+    }
 }

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/conversation/ConversationMessageService.java

@@ -128,6 +128,9 @@ public class ConversationMessageService {
             if (MessageCardConstants.CONTENT_TYPE_CARD_COST.equals(parsed.getContentType())) {
                 return "成本测算完成，请选择方案。";
             }
+            if (MessageCardConstants.CONTENT_TYPE_CARD_ORDER.equals(parsed.getContentType())) {
+                return "方案已确认，请让临时工扫码登记。";
+            }
             return "请查看卡片详情。";
         }
         return "";
@@ -140,6 +143,9 @@ public class ConversationMessageService {
         if (MessageCardConstants.CONTENT_TYPE_CARD_COST.equals(contentType)) {
             return MessageCardConstants.NEXT_ACTION_OPEN_COST_COMPARISON;
         }
+        if (MessageCardConstants.CONTENT_TYPE_CARD_ORDER.equals(contentType)) {
+            return MessageCardConstants.NEXT_ACTION_SHOW_ORDER_QRCODE;
+        }
         return null;
     }
 

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/conversation/MessageCardConstants.java

@@ -12,6 +12,7 @@ public final class MessageCardConstants {
 
     public static final String NEXT_ACTION_SHOW_EMPLOYMENT_DRAFT = "show_employment_draft";
     public static final String NEXT_ACTION_OPEN_COST_COMPARISON = "open_cost_comparison";
+    public static final String NEXT_ACTION_SHOW_ORDER_QRCODE = "show_order_qrcode";
 
     private MessageCardConstants() {
     }