From f9c776b3ab65f20507c7897b44107b49328be1e5 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Sat, 14 Feb 2026 19:07:12 +0800 Subject: [PATCH] =?UTF-8?q?feat(printer):=20=E6=94=AF=E6=8C=81=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=88=9B=E5=BB=BA=E8=99=9A=E6=8B=9F=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改CreateVirtualOrderRequest参数结构,将sourceId改为sourceIds列表 - 添加对sourceIds参数的空值校验 - 调用createBatchVirtualOrder方法替代原有单个订单创建逻辑 - 更新API接口支持多条source记录聚合为一笔订单 --- .../com/ycwl/basic/controller/pc/SourceController.java | 7 +++++-- .../basic/model/printer/req/CreateVirtualOrderRequest.java | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ycwl/basic/controller/pc/SourceController.java b/src/main/java/com/ycwl/basic/controller/pc/SourceController.java index e3d6905e..34b6207c 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/SourceController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/SourceController.java @@ -62,9 +62,12 @@ public class SourceController { */ @PostMapping("/createVirtualOrder") public ApiResponse> createVirtualOrder(@RequestBody CreateVirtualOrderRequest request) { + if (request.getSourceIds() == null || request.getSourceIds().isEmpty()) { + return ApiResponse.fail("sourceIds不能为空"); + } try { - Map result = printerService.createVirtualOrder( - request.getSourceId(), + Map result = printerService.createBatchVirtualOrder( + request.getSourceIds(), request.getScenicId(), request.getPrinterId(), request.getNeedEnhance(), diff --git a/src/main/java/com/ycwl/basic/model/printer/req/CreateVirtualOrderRequest.java b/src/main/java/com/ycwl/basic/model/printer/req/CreateVirtualOrderRequest.java index a97e16d4..5a6dba11 100644 --- a/src/main/java/com/ycwl/basic/model/printer/req/CreateVirtualOrderRequest.java +++ b/src/main/java/com/ycwl/basic/model/printer/req/CreateVirtualOrderRequest.java @@ -2,15 +2,17 @@ package com.ycwl.basic.model.printer.req; import lombok.Data; +import java.util.List; + /** * 创建虚拟用户0元订单请求参数 */ @Data public class CreateVirtualOrderRequest { /** - * source记录ID + * source记录ID列表(支持单个或多个sourceId聚合为一笔订单) */ - private Long sourceId; + private List sourceIds; /** * 景区ID