Bläddra i källkod

增加与ai大模型对话

wwh 2 veckor sedan
förälder
incheckning
f5a9fcbe7b

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

@@ -558,15 +558,17 @@ public class DraftService {
558 558
         response.setEstimatedTotal(draft.getEstimatedTotal());
559 559
         response.setEstimatedPerCapita(draft.getEstimatedPerCapita());
560 560
         response.setSelectedPlanId(draft.getSelectedPlanId());
561
-        response.setQrCodeUrl(findQrCodeUrlByDraftId(draft.getId()));
561
+        FeRegistrationBatch batch = findRegistrationBatchByDraftId(draft.getId());
562
+        response.setQrCodeUrl(batch != null ? batch.getQrCodeUrl() : null);
563
+        response.setQrToken(batch != null ? batch.getQrToken() : null);
562 564
         response.setFields(fields.stream().map(this::toFieldResponse).collect(Collectors.toList()));
563 565
         response.setCreateTime(draft.getCreateTime());
564 566
         response.setUpdateTime(draft.getUpdateTime());
565 567
         return response;
566 568
     }
567 569
 
568
-    /** 草稿确认后关联订单 → 登记批次上的小程序码;未确认则为 null。 */
569
-    private String findQrCodeUrlByDraftId(Long draftId) {
570
+    /** 草稿确认后关联订单 → 登记批次;未确认则为 null。 */
571
+    private FeRegistrationBatch findRegistrationBatchByDraftId(Long draftId) {
570 572
         if (draftId == null) {
571 573
             return null;
572 574
         }
@@ -577,11 +579,10 @@ public class DraftService {
577 579
         if (order == null) {
578 580
             return null;
579 581
         }
580
-        FeRegistrationBatch batch = feRegistrationBatchMapper.selectOne(new LambdaQueryWrapper<FeRegistrationBatch>()
582
+        return feRegistrationBatchMapper.selectOne(new LambdaQueryWrapper<FeRegistrationBatch>()
581 583
                 .eq(FeRegistrationBatch::getOrderId, order.getId())
582 584
                 .orderByDesc(FeRegistrationBatch::getId)
583 585
                 .last("LIMIT 1"));
584
-        return batch != null ? batch.getQrCodeUrl() : null;
585 586
     }
586 587
 
587 588
     private DraftFieldResponse toFieldResponse(FeDraftField entity) {

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

@@ -99,11 +99,12 @@ public class DraftDetailResponse {
99 99
     @Schema(description = "已选方案 ID")
100 100
     private Long selectedPlanId;
101 101
 
102
-    @JsonProperty("qr_code_url")
103
-    @JsonInclude(JsonInclude.Include.ALWAYS)
104 102
     @Schema(description = "登记小程序码图片 URL(确认方案后由 fe_registration_batch 带回;未确认时为 null)")
105 103
     private String qrCodeUrl;
106 104
 
105
+    @Schema(description = "登记扫码 token(fe_registration_batch.qr_token,与小程序码 scene 一致;未确认时为 null)")
106
+    private String qrToken;
107
+
107 108
     @Schema(description = "字段级明细(来源、可编辑性)")
108 109
     private List<DraftFieldResponse> fields;
109 110
 
@@ -345,6 +346,14 @@ public class DraftDetailResponse {
345 346
         this.qrCodeUrl = qrCodeUrl;
346 347
     }
347 348
 
349
+    public String getQrToken() {
350
+        return qrToken;
351
+    }
352
+
353
+    public void setQrToken(String qrToken) {
354
+        this.qrToken = qrToken;
355
+    }
356
+
348 357
     public List<DraftFieldResponse> getFields() {
349 358
         return fields;
350 359
     }